diff --git a/.devops/build.yml b/.devops/build.yml
index 122e663..f6577b2 100644
--- a/.devops/build.yml
+++ b/.devops/build.yml
@@ -156,8 +156,6 @@ extends:
                   REGISTRIES=msopenjdk.azurecr.io/internal/private/openjdk/jdk:$(version)-$(distro)
                   if [[ "$(distro)" == "azurelinux" ]]; then
                     REGISTRIES+=";msopenjdk.azurecr.io/internal/private/openjdk/jdk:$(version)-mariner"
-                  elif [[ "$(distro)" == "mariner" ]]; then
-                    REGISTRIES="msopenjdk.azurecr.io/internal/private/openjdk/jdk:$(version)-mariner-cm2"
                   fi
                   echo "##vso[task.setvariable variable=REGISTRIES]$REGISTRIES"
                 displayName: Set REGISTRIES variable
@@ -233,9 +231,6 @@ extends:
                   TAGS="$(version)-$(distro)"
                   if [[ "$(distro)" == "azurelinux" ]]; then
                     REGISTRIES+=";msopenjdk.azurecr.io/public/openjdk/jdk:$(version)-mariner"
-                  elif [[ "$(distro)" == "mariner" ]]; then
-                    REGISTRIES="msopenjdk.azurecr.io/public/openjdk/jdk:$(version)-mariner-cm2"
-                    TAGS="$(version)-mariner-cm2"
                   fi
                   echo "##vso[task.setvariable variable=REGISTRIES]$REGISTRIES"
                   echo "##vso[task.setvariable variable=TAGS]$TAGS"
diff --git a/.github/workflows/check-versions.yml b/.github/workflows/check-versions.yml
index b0de672..487bc5a 100644
--- a/.github/workflows/check-versions.yml
+++ b/.github/workflows/check-versions.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        distros: [ "azurelinux", "mariner", "distroless" ]
+        distros: [ "azurelinux", "distroless" ]
         jdkvendor: [ "temurin" ]
         jdkversion: [ { major: "8", expected: "1.8.0_452" } ]
     steps:
@@ -38,7 +38,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        distros: [ "azurelinux", "mariner", "distroless", "ubuntu" ]
+        distros: [ "azurelinux", "distroless", "ubuntu" ]
         jdkvendor: [ "msopenjdk" ]
         jdkversion: [ { major: "11", expected: "11.0.27" }, { major: "17", expected: "17.0.15" }, { major: "21", expected: "21.0.7" } ]
     steps:
diff --git a/.github/workflows/validate-published-images.yml b/.github/workflows/validate-published-images.yml
index 4e571ca..980c074 100644
--- a/.github/workflows/validate-published-images.yml
+++ b/.github/workflows/validate-published-images.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        distros: ["azurelinux", "mariner", "distroless"]
+        distros: ["azurelinux", "distroless"]
         jdkvendor: ["temurin"]
         jdkversion: [{ major: "8", expected: "1.8.0_452" }]
     steps:
@@ -31,7 +31,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        distros: ["azurelinux", "mariner", "distroless", "ubuntu"]
+        distros: ["azurelinux", "distroless", "ubuntu"]
         jdkvendor: ["msopenjdk"]
         jdkversion:
           [
@@ -55,7 +55,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        distros: ["azurelinux", "mariner", "distroless", "ubuntu"]
+        distros: ["azurelinux", "distroless", "ubuntu"]
         jdkvendor: ["msopenjdk"]
         jdkversion:
           [
diff --git a/docker/mariner/Dockerfile.msopenjdk-11-jdk b/docker/mariner-cm2/Dockerfile.msopenjdk-11-jdk
similarity index 100%
rename from docker/mariner/Dockerfile.msopenjdk-11-jdk
rename to docker/mariner-cm2/Dockerfile.msopenjdk-11-jdk
diff --git a/docker/mariner/Dockerfile.msopenjdk-17-jdk b/docker/mariner-cm2/Dockerfile.msopenjdk-17-jdk
similarity index 100%
rename from docker/mariner/Dockerfile.msopenjdk-17-jdk
rename to docker/mariner-cm2/Dockerfile.msopenjdk-17-jdk
diff --git a/docker/mariner/Dockerfile.msopenjdk-21-jdk b/docker/mariner-cm2/Dockerfile.msopenjdk-21-jdk
similarity index 100%
rename from docker/mariner/Dockerfile.msopenjdk-21-jdk
rename to docker/mariner-cm2/Dockerfile.msopenjdk-21-jdk
diff --git a/docker/mariner/Dockerfile.temurin-8-jdk b/docker/mariner-cm2/Dockerfile.temurin-8-jdk
similarity index 100%
rename from docker/mariner/Dockerfile.temurin-8-jdk
rename to docker/mariner-cm2/Dockerfile.temurin-8-jdk