diff --git a/eap-xp2/image.yaml b/eap-xp2/image.yaml
index 1e4ca96b..f4e8ade1 100644
--- a/eap-xp2/image.yaml
+++ b/eap-xp2/image.yaml
@@ -32,7 +32,7 @@ modules:
           - name: cct_module
             git:
                   url: https://github.com/jboss-openshift/cct_module.git
-                  ref: 0.39.3
+                  ref: 0.39.5
           - name: jboss-eap-modules
             git:
                   url: https://github.com/jboss-container-images/jboss-eap-modules.git
diff --git a/eap-xp2/rel-j9-11-xp-overrides.yaml b/eap-xp2/rel-j9-11-xp-overrides.yaml
index a268c978..d7d5198f 100644
--- a/eap-xp2/rel-j9-11-xp-overrides.yaml
+++ b/eap-xp2/rel-j9-11-xp-overrides.yaml
@@ -15,7 +15,7 @@ modules:
             version: '3.6'
           - name: jboss.container.java.rm-openjdk
           - name: jboss.container.openjdk.jdk
-            version: "openj9-11"
+            version: "semeru-11-open"
 
 packages:
   manager: dnf
@@ -30,10 +30,6 @@ osbs:
           - ppc64le
       compose:
         pulp_repos: true
-        packages:
-          - java-11-openj9
-          - java-11-openj9-headless
-          - java-11-openj9-devel
         signing_intent: release
         inherit: true
   repository:
diff --git a/eap-xp2/runtime-image/image.yaml b/eap-xp2/runtime-image/image.yaml
index e40a852f..3f9d1793 100644
--- a/eap-xp2/runtime-image/image.yaml
+++ b/eap-xp2/runtime-image/image.yaml
@@ -48,7 +48,7 @@ modules:
           - name: cct_module
             git:
                   url: https://github.com/jboss-openshift/cct_module.git
-                  ref: 0.39.3
+                  ref: 0.39.5
           - name: jboss-eap-modules
             git:
                   url: https://github.com/jboss-container-images/jboss-eap-modules.git
diff --git a/eap-xp2/runtime-image/rel-j9-11-xp-overrides.yaml b/eap-xp2/runtime-image/rel-j9-11-xp-overrides.yaml
index 2182759d..66e29227 100644
--- a/eap-xp2/runtime-image/rel-j9-11-xp-overrides.yaml
+++ b/eap-xp2/runtime-image/rel-j9-11-xp-overrides.yaml
@@ -11,7 +11,7 @@ modules:
           - name: os-eap-python
             version: '3.6'
           - name: jboss.container.openjdk.jdk
-            version: "openj9-11"
+            version: "semeru-11-open"
 
 
 
@@ -30,10 +30,6 @@ osbs:
           - ppc64le
       compose:
         pulp_repos: true
-        packages:
-          - java-11-openj9
-          - java-11-openj9-headless
-          - java-11-openj9-devel
         signing_intent: release
         inherit: true
 
diff --git a/image.yaml b/image.yaml
index 8acddcc4..26626b89 100644
--- a/image.yaml
+++ b/image.yaml
@@ -32,7 +32,7 @@ modules:
           - name: cct_module
             git:
                   url: https://github.com/jboss-openshift/cct_module.git
-                  ref: 0.39.3
+                  ref: 0.39.5
           - name: jboss-eap-modules
             git:
                   url: https://github.com/jboss-container-images/jboss-eap-modules.git
@@ -121,7 +121,7 @@ modules:
 artifacts:
   - name: maven-repo
     target: maven-repo.zip
-    md5: cab767786da612d1c00ece4cd6520035
+    md5: 040d39b5ee113b1712ff2e5b054d5903
 
 run:
       user: 185
diff --git a/rel-j9-11-overrides.yaml b/rel-j9-11-overrides.yaml
index 6d920fb9..9a8d8152 100644
--- a/rel-j9-11-overrides.yaml
+++ b/rel-j9-11-overrides.yaml
@@ -15,7 +15,7 @@ modules:
             version: '3.6'
           - name: jboss.container.java.rm-openjdk
           - name: jboss.container.openjdk.jdk
-            version: "openj9-11"
+            version: "semeru-11-open"
 
 packages:
   manager: dnf
@@ -30,10 +30,6 @@ osbs:
           - ppc64le
       compose:
         pulp_repos: true
-        packages:
-          - java-11-openj9
-          - java-11-openj9-headless
-          - java-11-openj9-devel
         signing_intent: release
         inherit: true
   repository:
diff --git a/runtime-image/image.yaml b/runtime-image/image.yaml
index de388581..b35cb31c 100644
--- a/runtime-image/image.yaml
+++ b/runtime-image/image.yaml
@@ -48,7 +48,7 @@ modules:
           - name: cct_module
             git:
                   url: https://github.com/jboss-openshift/cct_module.git
-                  ref: 0.39.3
+                  ref: 0.39.5
           - name: jboss-eap-modules
             git:
                   url: https://github.com/jboss-container-images/jboss-eap-modules.git
diff --git a/runtime-image/j9-11-overrides.yaml b/runtime-image/j9-11-overrides.yaml
index 0db6e2fc..0cc7ee24 100644
--- a/runtime-image/j9-11-overrides.yaml
+++ b/runtime-image/j9-11-overrides.yaml
@@ -13,7 +13,7 @@ modules:
             version: '3.6'
           - name: jboss.container.java.rm-openjdk
           - name: jboss.container.openjdk.jdk
-            version: "openj9-11"
+            version: "semeru-11-open"
 
 packages:
       content_sets_file: content_sets_rhel8.yml
@@ -30,10 +30,6 @@ osbs:
           - ppc64le
       compose:
         pulp_repos: true
-        packages:
-          - java-11-openj9
-          - java-11-openj9-headless
-          - java-11-openj9-devel
         signing_intent: release
         inherit: true
   repository: