diff --git a/.github/workflows/ubi9-openjdk-21.yml b/.github/workflows/ubi9-openjdk-21.yml
index 3b23687e..28d4080b 100644
--- a/.github/workflows/ubi9-openjdk-21.yml
+++ b/.github/workflows/ubi9-openjdk-21.yml
@@ -2,9 +2,9 @@ name: UBI9 OpenJDK 21 S2I Image CI
 on: [push, pull_request]
 env:
   LANG: en_US.UTF-8
-  IMAGE: ubi9-openjdk-21
+  IMAGE: openjdk-21-jlink-rhel9
 jobs:
   call-openjdkci:
     uses: ./.github/workflows/image-workflow-template.yml
     with:
-      image: ubi9-openjdk-21
+      image: openjdk-21-jlink-rhel9
diff --git a/modules/jdk/21/module.yaml b/modules/jdk/21/module.yaml
index 764a16cd..585d4599 100644
--- a/modules/jdk/21/module.yaml
+++ b/modules/jdk/21/module.yaml
@@ -25,6 +25,7 @@ envs:
 packages:
   install:
   - java-21-openjdk-devel
+  - java-21-openjdk-jmods
 
 modules:
   install:
diff --git a/modules/jlink/tests/features/jlink.feature b/modules/jlink/tests/features/jlink.feature
index 89c61800..67d1af16 100644
--- a/modules/jlink/tests/features/jlink.feature
+++ b/modules/jlink/tests/features/jlink.feature
@@ -1,5 +1,5 @@
 @ubi9/openjdk-17
-@ubi9/openjdk-21
+@openjdk-tech-preview/openjdk-21-jlink-rhel9
 Feature: Openshift OpenJDK S2I tests (jlink specific)
 Scenario: Ensure jlinked builder is used to build the containerized application image
       Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from quarkus-quickstarts/getting-started-3.0.1.Final-nos2i
diff --git a/redhat/ubi9-openjdk-21.yaml b/redhat/ubi9-openjdk-21.yaml
index 5ce6f524..377d5fbc 100644
--- a/redhat/ubi9-openjdk-21.yaml
+++ b/redhat/ubi9-openjdk-21.yaml
@@ -10,7 +10,7 @@ osbs:
         signing_intent: release
   repository:
     name: containers/openjdk
-    branch: openjdk-21-ubi9
+    branch: openjdk-21-jlink-tech-preview-ubi9
 
 packages:
   manager: microdnf
diff --git a/tests/features/java.security.feature b/tests/features/java.security.feature
index 05be83d9..de8a4103 100644
--- a/tests/features/java.security.feature
+++ b/tests/features/java.security.feature
@@ -1,6 +1,6 @@
 @ubi9/openjdk-11
 @ubi9/openjdk-17
-@ubi9/openjdk-21
+@openjdk-tech-preview/openjdk-21-jlink-rhel9
 Feature: Openshift S2I tests
   Scenario: Check networkaddress.cache.negative.ttl has been set correctly
     Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from binary-cli-security-property
diff --git a/tests/features/java/java_s2i.feature b/tests/features/java/java_s2i.feature
index 616b57b5..eb907fbe 100644
--- a/tests/features/java/java_s2i.feature
+++ b/tests/features/java/java_s2i.feature
@@ -2,7 +2,7 @@
 @ignore
 @ubi9/openjdk-11
 @ubi9/openjdk-17
-@ubi9/openjdk-21
+@openjdk-tech-preview/openjdk-21-jlink-rhel9
 Feature: Openshift OpenJDK S2I tests
 # NOTE: these tests should be usable with the other images once we have refactored the JDK scripts.
 # These builds do not actually run maven. This is important, because the proxy
diff --git a/tests/features/java/java_s2i_inc.feature b/tests/features/java/java_s2i_inc.feature
index 57a820f2..acdd2234 100644
--- a/tests/features/java/java_s2i_inc.feature
+++ b/tests/features/java/java_s2i_inc.feature
@@ -1,6 +1,6 @@
 @ubi9/openjdk-11
 @ubi9/openjdk-17
-@ubi9/openjdk-21
+@openjdk-tech-preview/openjdk-21-jlink-rhel9
 Feature: Openshift OpenJDK S2I tests
 
   # test incremental builds
diff --git a/tests/features/java/memory.feature b/tests/features/java/memory.feature
index 64ca3858..8d81c344 100644
--- a/tests/features/java/memory.feature
+++ b/tests/features/java/memory.feature
@@ -35,7 +35,7 @@ Feature: OPENJDK-559 JVM Memory tests
   # Not the runtime images
   @ubi9/openjdk-11
   @ubi9/openjdk-17
-  @ubi9/openjdk-21
+  @openjdk-tech-preview/openjdk-21-jlink-rhel9
   Scenario: Ensure Maven doesn't use MaxRAMPercentage=80
     Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from spring-boot-sample-simple
     Then s2i build log should match regex INFO Using MAVEN_OPTS.*-XX:MaxRAMPercentage=25.0$
diff --git a/tests/features/java/openjdk_s2i.feature b/tests/features/java/openjdk_s2i.feature
index 65686c8d..3f096dfa 100644
--- a/tests/features/java/openjdk_s2i.feature
+++ b/tests/features/java/openjdk_s2i.feature
@@ -1,7 +1,7 @@
 # builder only
 @ubi9/openjdk-11
 @ubi9/openjdk-17
-@ubi9/openjdk-21
+@openjdk-tech-preview/openjdk-21-jlink-rhel9
 Feature: Openshift OpenJDK-only S2I tests
 
   @ignore
diff --git a/tests/features/java/ports.feature b/tests/features/java/ports.feature
index 6542c246..dcf0a2a5 100644
--- a/tests/features/java/ports.feature
+++ b/tests/features/java/ports.feature
@@ -1,6 +1,6 @@
 @ubi9/openjdk-11
 @ubi9/openjdk-17
-@ubi9/openjdk-21
+@openjdk-tech-preview/openjdk-21-jlink-rhel9
 Feature: Openshift OpenJDK port tests
 
   Scenario: Check ports are available
diff --git a/tests/features/java/runtime.feature b/tests/features/java/runtime.feature
index 10477a62..439952a1 100644
--- a/tests/features/java/runtime.feature
+++ b/tests/features/java/runtime.feature
@@ -1,6 +1,6 @@
 @ubi9/openjdk-11
 @ubi9/openjdk-17
-@ubi9/openjdk-21
+@openjdk-tech-preview/openjdk-21-jlink-rhel9
 Feature: Openshift OpenJDK Runtime tests
 
   Scenario: Ensure JAVA_ARGS is passed through, diagnostic options work correctly, JVM_ARGS not present in run script, OPENJDK-474 JAVA_ARGS not repeated
diff --git a/tests/features/openshift.feature b/tests/features/openshift.feature
index ceb6be8d..9f4e0c85 100644
--- a/tests/features/openshift.feature
+++ b/tests/features/openshift.feature
@@ -11,7 +11,7 @@ Feature: Tests for all openshift images
   # builder-only test
   @ubi9/openjdk-11
   @ubi9/openjdk-17
-  @ubi9/openjdk-21
+  @openjdk-tech-preview/openjdk-21-jlink-rhel9
   Scenario: Check that builder labels are correctly set
     Given image is built
     Then the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
diff --git a/tests/features/s2i-core.feature b/tests/features/s2i-core.feature
index cf4b3625..1ab11c78 100644
--- a/tests/features/s2i-core.feature
+++ b/tests/features/s2i-core.feature
@@ -1,6 +1,6 @@
 @ubi9/openjdk-11
 @ubi9/openjdk-17
-@ubi9/openjdk-21
+@openjdk-tech-preview/openjdk-21-jlink-rhel9
 Feature: Openshift S2I tests
   # OPENJDK-84 - /tmp/src should not be present after build
   Scenario: run an s2i build and check that /tmp/src has been removed afterwards
diff --git a/ubi9-openjdk-21.yaml b/ubi9-openjdk-21.yaml
index 0e008dc0..10f27f13 100644
--- a/ubi9-openjdk-21.yaml
+++ b/ubi9-openjdk-21.yaml
@@ -3,7 +3,7 @@
 schema_version: 1
 
 from: "registry.access.redhat.com/ubi9/ubi-minimal"
-name: &name "ubi9/openjdk-21"
+name: &name "openjdk-tech-preview/openjdk-21-jlink-rhel9"
 version: &version "1.18"
 description: "Source To Image (S2I) image for Red Hat OpenShift providing OpenJDK 21"
 
@@ -17,7 +17,7 @@ labels:
 - name: "maintainer"
   value: "Red Hat OpenJDK <openjdk@redhat.com>"
 - name: "com.redhat.component"
-  value: "openjdk-21-ubi9-container"
+  value: "openjdk-21-jlink-tech-preview-ubi9-container"
 - name: "usage"
   value: "https://access.redhat.com/documentation/en-us/red_hat_jboss_middleware_for_openshift/3/html/red_hat_java_s2i_for_openshift/"
 - name: "com.redhat.license_terms"