diff --git a/wildfly-builder-image/image.yaml b/wildfly-builder-image/image.yaml
index 12372a1d..e774066b 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: ubi8
+              ref: wildfly-container-30.0
           - name: wildfly-cekit-modules
             git:
               url: https://github.com/wildfly/wildfly-cekit-modules
-              ref: main
+              ref: 0.30.1
           - name: wildfly-modules
             path: ../wildfly-modules
       install:
diff --git a/wildfly-builder-image/jdk11-overrides.yaml b/wildfly-builder-image/jdk11-overrides.yaml
index 51a93dd6..5e4d8f99 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 "1.1.4-jdk11-snapshot"
+version: &imgVersion "1.1.4-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 93d8706c..b33a4b25 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 "1.1.4-jdk17-snapshot"
+version: &imgVersion "1.1.4-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 430581db..830cc753 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 "1.1.4-jdk21-snapshot"
+version: &imgVersion "1.1.4-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 8cffde8a..45c6760b 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: ubi8
+              ref: wildfly-container-30.0
           - name: wildfly-cekit-modules
             git:
               url: https://github.com/wildfly/wildfly-cekit-modules
-              ref: main
+              ref: 0.30.1
           - name: wildfly-modules
             path: ../wildfly-modules
       install:
diff --git a/wildfly-runtime-image/jdk11-overrides.yaml b/wildfly-runtime-image/jdk11-overrides.yaml
index 6a48e820..d9a52acc 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 "1.1.4-jdk11-snapshot"
+version: &imgVersion "1.1.4-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 e9feac74..bd70e16f 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 "1.1.4-jdk17-snapshot"
+version: &imgVersion "1.1.4-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 a4b96ee2..c2bae7f5 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 "1.1.4-jdk21-snapshot"
+version: &imgVersion "1.1.4-jdk21"
 labels:
   - name: "org.jboss.product.version"
     value: *imgVersion