diff --git a/redhat/ubi9-openjdk-21-runtime.yaml b/redhat/ubi10-openjdk-21-runtime.yaml
similarity index 95%
rename from redhat/ubi9-openjdk-21-runtime.yaml
rename to redhat/ubi10-openjdk-21-runtime.yaml
index 8f67a7d4..624cd7c2 100644
--- a/redhat/ubi9-openjdk-21-runtime.yaml
+++ b/redhat/ubi10-openjdk-21-runtime.yaml
@@ -12,7 +12,7 @@ osbs:
         signing_intent: release
   repository:
     name: containers/openjdk
-    branch: openjdk-21-runtime-ubi9
+    branch: openjdk-21-runtime-ubi10
 
 packages:
   manager: microdnf
diff --git a/redhat/ubi9-openjdk-21.yaml b/redhat/ubi10-openjdk-21.yaml
similarity index 96%
rename from redhat/ubi9-openjdk-21.yaml
rename to redhat/ubi10-openjdk-21.yaml
index 19905492..3fcdf991 100644
--- a/redhat/ubi9-openjdk-21.yaml
+++ b/redhat/ubi10-openjdk-21.yaml
@@ -14,7 +14,7 @@ osbs:
         signing_intent: release
   repository:
     name: containers/openjdk
-    branch: openjdk-21-ubi9
+    branch: openjdk-21-ubi10
 
 packages:
   manager: microdnf
diff --git a/ubi9-openjdk-21-runtime.yaml b/ubi10-openjdk-21-runtime.yaml
similarity index 94%
rename from ubi9-openjdk-21-runtime.yaml
rename to ubi10-openjdk-21-runtime.yaml
index 74400dd2..a4f7e835 100644
--- a/ubi9-openjdk-21-runtime.yaml
+++ b/ubi10-openjdk-21-runtime.yaml
@@ -3,7 +3,7 @@
 schema_version: 1
 
 from: "registry.access.redhat.com/ubi9/ubi-minimal"
-name: &name "ubi9/openjdk-21-runtime"
+name: &name "ubi10/openjdk-21-runtime"
 version: &version "1.21"
 description: "Image for Red Hat OpenShift providing OpenJDK 21 runtime"
 
@@ -17,7 +17,7 @@ labels:
 - name: "maintainer"
   value: "Red Hat OpenJDK <openjdk@redhat.com>"
 - name: "com.redhat.component"
-  value: "openjdk-21-runtime-ubi9-container"
+  value: "openjdk-21-runtime-ubi10-container"
 - name: "usage"
   value: &docs "https://rh-openjdk.github.io/redhat-openjdk-containers/"
 - name: "com.redhat.license_terms"
diff --git a/ubi9-openjdk-21.yaml b/ubi10-openjdk-21.yaml
similarity index 95%
rename from ubi9-openjdk-21.yaml
rename to ubi10-openjdk-21.yaml
index 5caddc97..bf5c3ed9 100644
--- a/ubi9-openjdk-21.yaml
+++ b/ubi10-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 "ubi10/openjdk-21"
 version: &version "1.21"
 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-ubi10-container"
 - name: "usage"
   value: &docs "https://rh-openjdk.github.io/redhat-openjdk-containers/"
 - name: "com.redhat.license_terms"