diff --git a/wildfly-builder-image/image.yaml b/wildfly-builder-image/image.yaml
index 843c96dc..2c42f488 100644
--- a/wildfly-builder-image/image.yaml
+++ b/wildfly-builder-image/image.yaml
@@ -43,11 +43,11 @@ modules:
           - name: openjdk
             git:
               url: https://github.com/jboss-container-images/openjdk
-              ref: ubi9
+              ref: ubi9-wildfly-container-33.0
           - name: wildfly-cekit-modules
             git:
               url: https://github.com/wildfly/wildfly-cekit-modules
-              ref: main
+              ref: 0.33.0
           - name: wildfly-modules
             path: ../wildfly-modules
       install:
diff --git a/wildfly-builder-image/jdk11-overrides.yaml b/wildfly-builder-image/jdk11-overrides.yaml
index b5bbec2e..f2c55f72 100644
--- a/wildfly-builder-image/jdk11-overrides.yaml
+++ b/wildfly-builder-image/jdk11-overrides.yaml
@@ -1,7 +1,7 @@
 schema_version: 1
 
 description: "The WildFly s2i builder image, JDK 11"
-version: &imgVersion "2.0.1-jdk11-snapshot"
+version: &imgVersion "2.0.1-jdk11"
 labels:
     - name: io.k8s.display-name
       value: "WildFly s2i builder image, JDK 11"
diff --git a/wildfly-builder-image/jdk17-overrides.yaml b/wildfly-builder-image/jdk17-overrides.yaml
index 97ce4d6c..e3c39f80 100644
--- a/wildfly-builder-image/jdk17-overrides.yaml
+++ b/wildfly-builder-image/jdk17-overrides.yaml
@@ -1,7 +1,7 @@
 schema_version: 1
 
 description: "The WildFly s2i builder image, JDK 17"
-version: &imgVersion "2.0.1-jdk17-snapshot"
+version: &imgVersion "2.0.1-jdk17"
 labels:
     - name: io.k8s.display-name
       value: "WildFly s2i builder image, JDK 17"
diff --git a/wildfly-builder-image/jdk21-overrides.yaml b/wildfly-builder-image/jdk21-overrides.yaml
index 778a811b..eb8be93a 100644
--- a/wildfly-builder-image/jdk21-overrides.yaml
+++ b/wildfly-builder-image/jdk21-overrides.yaml
@@ -1,7 +1,7 @@
 schema_version: 1
 
 description: "The WildFly s2i builder image, JDK 21"
-version: &imgVersion "2.0.1-jdk21-snapshot"
+version: &imgVersion "2.0.1-jdk21"
 labels:
     - name: io.k8s.display-name
       value: "WildFly s2i builder image, JDK 21"
diff --git a/wildfly-runtime-image/image.yaml b/wildfly-runtime-image/image.yaml
index 09a8eeae..039cb6b3 100644
--- a/wildfly-runtime-image/image.yaml
+++ b/wildfly-runtime-image/image.yaml
@@ -31,11 +31,11 @@ modules:
           - name: openjdk
             git:
               url: https://github.com/jboss-container-images/openjdk
-              ref: ubi9
+              ref: ubi9-wildfly-container-33.0
           - name: wildfly-cekit-modules
             git:
               url: https://github.com/wildfly/wildfly-cekit-modules
-              ref: main
+              ref: 0.33.0
           - name: wildfly-modules
             path: ../wildfly-modules
       install:
diff --git a/wildfly-runtime-image/jdk11-overrides.yaml b/wildfly-runtime-image/jdk11-overrides.yaml
index 7a83462c..b4579102 100644
--- a/wildfly-runtime-image/jdk11-overrides.yaml
+++ b/wildfly-runtime-image/jdk11-overrides.yaml
@@ -1,7 +1,7 @@
 schema_version: 1
 
 description: "The WildFly runtime image, JDK 11"
-version: &imgVersion "2.0.1-jdk11-snapshot"
+version: &imgVersion "2.0.1-jdk11"
 labels:
   - name: "org.jboss.product.version"
     value: *imgVersion
diff --git a/wildfly-runtime-image/jdk17-overrides.yaml b/wildfly-runtime-image/jdk17-overrides.yaml
index 8412a724..0cbebd8d 100644
--- a/wildfly-runtime-image/jdk17-overrides.yaml
+++ b/wildfly-runtime-image/jdk17-overrides.yaml
@@ -1,7 +1,7 @@
 schema_version: 1
 
 description: "The WildFly runtime image, JDK 17"
-version: &imgVersion "2.0.1-jdk17-snapshot"
+version: &imgVersion "2.0.1-jdk17"
 labels:
   - name: "org.jboss.product.version"
     value: *imgVersion
diff --git a/wildfly-runtime-image/jdk21-overrides.yaml b/wildfly-runtime-image/jdk21-overrides.yaml
index 7b7ac08f..ff04e447 100644
--- a/wildfly-runtime-image/jdk21-overrides.yaml
+++ b/wildfly-runtime-image/jdk21-overrides.yaml
@@ -1,7 +1,7 @@
 schema_version: 1
 
 description: "The WildFly runtime image, JDK 21"
-version: &imgVersion "2.0.1-jdk21-snapshot"
+version: &imgVersion "2.0.1-jdk21"
 labels:
   - name: "org.jboss.product.version"
     value: *imgVersion