diff --git a/docs/index.adoc b/docs/index.adoc
index f94960bf..8ddeac8d 100644
--- a/docs/index.adoc
+++ b/docs/index.adoc
@@ -16,7 +16,7 @@ The example link:https://github.com/wildfly/wildfly-s2i/blob/main/examples/docke
 
 === Image API
 
-When running a WildFly server inside the WildFly S2i runtime, you can use these link:https://github.com/jboss-container-images/openjdk/blob/ubi9/modules/jvm/module.yaml[environment variables] to configure the Java VM.
+When running a WildFly server inside the WildFly S2i runtime, you can use these link:https://github.com/rh-openjdk/redhat-openjdk-containers/blob/ubi9/modules/jvm/module.yaml[environment variables] to configure the Java VM.
 The WildFly S2i runtime image is exposing a set of link:https://github.com/wildfly/wildfly-cekit-modules/blob/main/jboss/container/wildfly/run/api/module.yaml[environment variables] to fine tune the server execution.
 
 == WildFly - UBI9 S2I builder image
diff --git a/docs/index.html b/docs/index.html
index 69e42251..a6d9411c 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -467,7 +467,7 @@ <h2 id="_wildfly_ubi9_runtime_image">WildFly - UBI9 runtime image</h2>
 <div class="sect2">
 <h3 id="_image_api">Image API</h3>
 <div class="paragraph">
-<p>When running a WildFly server inside the WildFly S2i runtime, you can use these <a href="https://github.com/jboss-container-images/openjdk/blob/ubi9/modules/jvm/module.yaml">environment variables</a> to configure the Java VM.
+<p>When running a WildFly server inside the WildFly S2i runtime, you can use these <a href="https://github.com/rh-openjdk/redhat-openjdk-containers/blob/ubi9/modules/jvm/module.yaml">environment variables</a> to configure the Java VM.
 The WildFly S2i runtime image is exposing a set of <a href="https://github.com/wildfly/wildfly-cekit-modules/blob/main/jboss/container/wildfly/run/api/module.yaml">environment variables</a> to fine tune the server execution.</p>
 </div>
 </div>
@@ -636,7 +636,7 @@ <h2 id="_using_image_streams_with_helm_chart_for_wildfly">Using image streams wi
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-10-10 11:53:36 +0200
+Last updated 2024-11-04 14:35:05 +0100
 </div>
 </div>
 </body>
diff --git a/release_process.md b/release_process.md
index 2e7b6df3..0402ae3a 100644
--- a/release_process.md
+++ b/release_process.md
@@ -13,7 +13,7 @@ new snapshot images are deployed to the `quay.io/wildfly-snapshots` organization
 ### Release new images
 
 * Tag [wildfly-cekit-modules](https://github.com/wildfly/wildfly-cekit-modules) if needed.
-* Ask for a tag in [openjdk s2i image](https://github.com/jboss-container-images/openjdk) modules repo if needed.
+* Ask for a tag in [openjdk s2i image](https://github.com/rh-openjdk/redhat-openjdk-containers) modules repo if needed.
 * In the wildfly-s2i main branch, update the wildfly-builder-image/jdkX-overrides.yaml files and wildfly-runtime-image/jdkX-overrides.yaml files 
 versions from `1.x.x-jdkX-snapshot` to `1.x.x-jdkX` and use the new `wildfly-cekit-modules` and `openjdk` tags as `ref`.
 * Open PR, tests are green, merge PR in main.
diff --git a/wildfly-builder-image/image.yaml b/wildfly-builder-image/image.yaml
index 95918477..dca99e33 100644
--- a/wildfly-builder-image/image.yaml
+++ b/wildfly-builder-image/image.yaml
@@ -42,7 +42,7 @@ modules:
       repositories:
           - name: openjdk
             git:
-              url: https://github.com/jboss-container-images/openjdk
+              url: https://github.com/rh-openjdk/redhat-openjdk-containers
               ref: ubi9
           - name: wildfly-cekit-modules
             git:
diff --git a/wildfly-runtime-image/image.yaml b/wildfly-runtime-image/image.yaml
index ae086e3e..4581dfa3 100644
--- a/wildfly-runtime-image/image.yaml
+++ b/wildfly-runtime-image/image.yaml
@@ -30,7 +30,7 @@ modules:
       repositories:
           - name: openjdk
             git:
-              url: https://github.com/jboss-container-images/openjdk
+              url: https://github.com/rh-openjdk/redhat-openjdk-containers
               ref: ubi9
           - name: wildfly-cekit-modules
             git: