diff --git a/wildfly-builder-image/image.yaml b/wildfly-builder-image/image.yaml
index e774066b..12372a1d 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: wildfly-container-30.0
+              ref: ubi8
           - name: wildfly-cekit-modules
             git:
               url: https://github.com/wildfly/wildfly-cekit-modules
-              ref: 0.30.1
+              ref: main
           - name: wildfly-modules
             path: ../wildfly-modules
       install:
diff --git a/wildfly-builder-image/jdk11-overrides.yaml b/wildfly-builder-image/jdk11-overrides.yaml
index 5e4d8f99..dd4bf3fc 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"
+version: &imgVersion "1.1.5-jdk11-snapshot"
 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 b33a4b25..5bcb9e0f 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"
+version: &imgVersion "1.1.5-jdk17-snapshot"
 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 830cc753..acf5b59c 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"
+version: &imgVersion "1.1.5-jdk21-snapshot"
 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 45c6760b..8cffde8a 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: wildfly-container-30.0
+              ref: ubi8
           - name: wildfly-cekit-modules
             git:
               url: https://github.com/wildfly/wildfly-cekit-modules
-              ref: 0.30.1
+              ref: main
           - name: wildfly-modules
             path: ../wildfly-modules
       install:
diff --git a/wildfly-runtime-image/jdk11-overrides.yaml b/wildfly-runtime-image/jdk11-overrides.yaml
index d9a52acc..3ac8224c 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"
+version: &imgVersion "1.1.5-jdk11-snapshot"
 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 bd70e16f..2c3f99a9 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"
+version: &imgVersion "1.1.5-jdk17-snapshot"
 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 c2bae7f5..7e4df997 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"
+version: &imgVersion "1.1.5-jdk21-snapshot"
 labels:
   - name: "org.jboss.product.version"
     value: *imgVersion