diff --git a/ubi9-openjdk-11.yaml b/openjdk-11-rhel9.yaml
similarity index 93%
rename from ubi9-openjdk-11.yaml
rename to openjdk-11-rhel9.yaml
index 66a48fef..e9f1e888 100644
--- a/ubi9-openjdk-11.yaml
+++ b/openjdk-11-rhel9.yaml
@@ -3,7 +3,7 @@
 schema_version: 1
 
 from: "registry.access.redhat.com/ubi9/ubi-minimal:9.4"
-name: &name "ubi9/openjdk-11"
+name: &name "openjdk-els/openjdk-11-rhel9"
 version: &version "1.20"
 description: "Source To Image (S2I) image for Red Hat OpenShift providing OpenJDK 11"
 
@@ -17,11 +17,11 @@ labels:
 - name: "maintainer"
   value: "Red Hat OpenJDK <openjdk@redhat.com>"
 - name: "com.redhat.component"
-  value: "openjdk-11-ubi9-container"
+  value: "openjdk-els-11-rhel9-container"
 - name: "usage"
   value: &docs "https://rh-openjdk.github.io/redhat-openjdk-containers/"
 - name: "com.redhat.license_terms"
-  value: "https://www.redhat.com/en/about/red-hat-end-user-license-agreements#UBI"
+  value: "https://www.redhat.com/en/about/red-hat-end-user-license-agreements"
 - name: "org.opencontainers.image.documentation"
   value: *docs
 - name: "name"
diff --git a/ubi9-openjdk-11-runtime.yaml b/openjdk-11-runtime-rhel9.yaml
similarity index 91%
rename from ubi9-openjdk-11-runtime.yaml
rename to openjdk-11-runtime-rhel9.yaml
index d9f70167..09942d65 100644
--- a/ubi9-openjdk-11-runtime.yaml
+++ b/openjdk-11-runtime-rhel9.yaml
@@ -3,7 +3,7 @@
 schema_version: 1
 
 from: "registry.access.redhat.com/ubi9/ubi-minimal:9.4"
-name: &name "ubi9/openjdk-11-runtime"
+name: &name "openjdk-els/openjdk-11-runtime-rhel9"
 version: &version "1.20"
 description: "Image for Red Hat OpenShift providing OpenJDK 11 runtime"
 
@@ -17,11 +17,11 @@ labels:
 - name: "maintainer"
   value: "Red Hat OpenJDK <openjdk@redhat.com>"
 - name: "com.redhat.component"
-  value: "openjdk-11-runtime-ubi9-container"
+  value: "openjdk-els-11-runtime-rhel9-container"
 - name: "usage"
   value: &docs "https://rh-openjdk.github.io/redhat-openjdk-containers/"
 - name: "com.redhat.license_terms"
-  value: "https://www.redhat.com/en/about/red-hat-end-user-license-agreements#UBI"
+  value: "https://www.redhat.com/en/about/red-hat-end-user-license-agreements"
 - name: "org.opencontainers.image.documentation"
   value: *docs
 - name: "name"
diff --git a/redhat/ubi9-openjdk-11.yaml b/redhat/openjdk-11-rhel9.yaml
similarity index 95%
rename from redhat/ubi9-openjdk-11.yaml
rename to redhat/openjdk-11-rhel9.yaml
index d5a47212..2826e8b4 100644
--- a/redhat/ubi9-openjdk-11.yaml
+++ b/redhat/openjdk-11-rhel9.yaml
@@ -10,7 +10,7 @@ osbs:
         signing_intent: release
   repository:
     name: containers/openjdk
-    branch: openjdk-11-ubi9
+    branch: openjdk-els-11-rhel-9
 
 packages:
   manager: microdnf
diff --git a/redhat/ubi9-openjdk-11-runtime.yaml b/redhat/openjdk-11-runtime-rhel9.yaml
similarity index 93%
rename from redhat/ubi9-openjdk-11-runtime.yaml
rename to redhat/openjdk-11-runtime-rhel9.yaml
index ca303541..3f3ad30a 100644
--- a/redhat/ubi9-openjdk-11-runtime.yaml
+++ b/redhat/openjdk-11-runtime-rhel9.yaml
@@ -8,7 +8,7 @@ osbs:
         signing_intent: release
   repository:
     name: containers/openjdk
-    branch: openjdk-11-runtime-ubi9
+    branch: openjdk-els-11-runtime-rhel-9
 
 packages:
   manager: microdnf