diff --git a/group.yml b/group.yml
index f35203a14..099100d54 100644
--- a/group.yml
+++ b/group.yml
@@ -241,20 +241,20 @@ repos:
   rhel-9-codeready-builder-rpms:
     conf:
       baseurl:
-        aarch64: https://rhsm-pulp.corp.redhat.com/content/eus/rhel9/9.4/aarch64/codeready-builder/os/
-        ppc64le: https://rhsm-pulp.corp.redhat.com/content/eus/rhel9/9.4/ppc64le/codeready-builder/os/
-        s390x: https://rhsm-pulp.corp.redhat.com/content/eus/rhel9/9.4/s390x/codeready-builder/os/
-        x86_64: https://rhsm-pulp.corp.redhat.com/content/eus/rhel9/9.4/x86_64/codeready-builder/os/
+        aarch64: https://rhsm-pulp.corp.redhat.com/content/e4s/rhel9/9.4/aarch64/codeready-builder/os/
+        ppc64le: https://rhsm-pulp.corp.redhat.com/content/e4s/rhel9/9.4/ppc64le/codeready-builder/os/
+        s390x: https://rhsm-pulp.corp.redhat.com/content/e4s/rhel9/9.4/s390x/codeready-builder/os/
+        x86_64: https://rhsm-pulp.corp.redhat.com/content/e4s/rhel9/9.4/x86_64/codeready-builder/os/
       ci_alignment:
         profiles:
         - el9
         localdev:
           enabled: true
     content_set:
-      default: codeready-builder-for-rhel-9-x86_64-eus-rpms__9_DOT_4
-      aarch64: codeready-builder-for-rhel-9-aarch64-eus-rpms__9_DOT_4
-      ppc64le: codeready-builder-for-rhel-9-ppc64le-eus-rpms__9_DOT_4
-      s390x: codeready-builder-for-rhel-9-s390x-eus-rpms__9_DOT_4
+      default: codeready-builder-for-rhel-9-x86_64-e4s-rpms__9_DOT_4
+      aarch64: codeready-builder-for-rhel-9-aarch64-e4s-rpms__9_DOT_4
+      ppc64le: codeready-builder-for-rhel-9-ppc64le-e4s-rpms__9_DOT_4
+      s390x: codeready-builder-for-rhel-9-s390x-e4s-rpms__9_DOT_4
     reposync:
       enabled: false
 
@@ -331,20 +331,20 @@ repos:
       extra_options:
         module_hotfixes: 1
       baseurl:
-        aarch64: "https://rhsm-pulp.corp.redhat.com/content/eus/rhel9/9.4/aarch64/baseos/os/"
-        ppc64le: "https://rhsm-pulp.corp.redhat.com/content/eus/rhel9/9.4/ppc64le/baseos/os/"
-        s390x: "https://rhsm-pulp.corp.redhat.com/content/eus/rhel9/9.4/s390x/baseos/os/"
-        x86_64: "https://rhsm-pulp.corp.redhat.com/content/eus/rhel9/9.4/x86_64/baseos/os/"
+        aarch64: "https://rhsm-pulp.corp.redhat.com/content/e4s/rhel9/9.4/aarch64/baseos/os/"
+        ppc64le: "https://rhsm-pulp.corp.redhat.com/content/e4s/rhel9/9.4/ppc64le/baseos/os/"
+        s390x: "https://rhsm-pulp.corp.redhat.com/content/e4s/rhel9/9.4/s390x/baseos/os/"
+        x86_64: "https://rhsm-pulp.corp.redhat.com/content/e4s/rhel9/9.4/x86_64/baseos/os/"
       ci_alignment:
         profiles:
         - el9
         localdev:
           enabled: true
     content_set:
-      default: rhel-9-for-x86_64-baseos-eus-rpms__9_DOT_4
-      aarch64: rhel-9-for-aarch64-baseos-eus-rpms__9_DOT_4
-      ppc64le: rhel-9-for-ppc64le-baseos-eus-rpms__9_DOT_4
-      s390x: rhel-9-for-s390x-baseos-eus-rpms__9_DOT_4
+      default: rhel-9-for-x86_64-baseos-e4s-rpms__9_DOT_4
+      aarch64: rhel-9-for-aarch64-baseos-e4s-rpms__9_DOT_4
+      ppc64le: rhel-9-for-ppc64le-baseos-e4s-rpms__9_DOT_4
+      s390x: rhel-9-for-s390x-baseos-e4s-rpms__9_DOT_4
     reposync:
       enabled: false
 
@@ -353,20 +353,20 @@ repos:
       extra_options:
         module_hotfixes: 1
       baseurl:
-        aarch64: "https://rhsm-pulp.corp.redhat.com/content/eus/rhel9/9.4/aarch64/appstream/os/"
-        ppc64le: "https://rhsm-pulp.corp.redhat.com/content/eus/rhel9/9.4/ppc64le/appstream/os/"
-        s390x: "https://rhsm-pulp.corp.redhat.com/content/eus/rhel9/9.4/s390x/appstream/os/"
-        x86_64: "https://rhsm-pulp.corp.redhat.com/content/eus/rhel9/9.4/x86_64/appstream/os/"
+        aarch64: "https://rhsm-pulp.corp.redhat.com/content/e4s/rhel9/9.4/aarch64/appstream/os/"
+        ppc64le: "https://rhsm-pulp.corp.redhat.com/content/e4s/rhel9/9.4/ppc64le/appstream/os/"
+        s390x: "https://rhsm-pulp.corp.redhat.com/content/e4s/rhel9/9.4/s390x/appstream/os/"
+        x86_64: "https://rhsm-pulp.corp.redhat.com/content/e4s/rhel9/9.4/x86_64/appstream/os/"
       ci_alignment:
         profiles:
         - el9
         localdev:
           enabled: true
     content_set:
-      default: rhel-9-for-x86_64-appstream-eus-rpms__9_DOT_4
-      aarch64: rhel-9-for-aarch64-appstream-eus-rpms__9_DOT_4
-      ppc64le: rhel-9-for-ppc64le-appstream-eus-rpms__9_DOT_4
-      s390x: rhel-9-for-s390x-appstream-eus-rpms__9_DOT_4
+      default: rhel-9-for-x86_64-appstream-e4s-rpms__9_DOT_4
+      aarch64: rhel-9-for-aarch64-appstream-e4s-rpms__9_DOT_4
+      ppc64le: rhel-9-for-ppc64le-appstream-e4s-rpms__9_DOT_4
+      s390x: rhel-9-for-s390x-appstream-e4s-rpms__9_DOT_4
     reposync:
       enabled: false
 
@@ -499,34 +499,34 @@ repos:
   rhel-96-baseos:
     conf:
       baseurl:
-        x86_64: https://rhsm-pulp.corp.redhat.com/content/eus/rhel9/9.6/x86_64/baseos/os/
-        aarch64: https://rhsm-pulp.corp.redhat.com/content/eus/rhel9/9.6/aarch64/baseos/os/
-        ppc64le: https://rhsm-pulp.corp.redhat.com/content/eus/rhel9/9.6/ppc64le/baseos/os/
-        s390x: https://rhsm-pulp.corp.redhat.com/content/eus/rhel9/9.6/s390x/baseos/os/
+        x86_64: https://rhsm-pulp.corp.redhat.com/content/e4s/rhel9/9.6/x86_64/baseos/os/
+        aarch64: https://rhsm-pulp.corp.redhat.com/content/e4s/rhel9/9.6/aarch64/baseos/os/
+        ppc64le: https://rhsm-pulp.corp.redhat.com/content/e4s/rhel9/9.6/ppc64le/baseos/os/
+        s390x: https://rhsm-pulp.corp.redhat.com/content/e4s/rhel9/9.6/s390x/baseos/os/
       extra_options:
         gpgcheck: "1"
     content_set:
-      default: rhel-9-for-x86_64-baseos-eus-rpms__9_DOT_6
-      aarch64: rhel-9-for-aarch64-baseos-eus-rpms__9_DOT_6
-      ppc64le: rhel-9-for-ppc64le-baseos-eus-rpms__9_DOT_6
-      s390x: rhel-9-for-s390x-baseos-eus-rpms__9_DOT_6
+      default: rhel-9-for-x86_64-baseos-e4s-rpms__9_DOT_6
+      aarch64: rhel-9-for-aarch64-baseos-e4s-rpms__9_DOT_6
+      ppc64le: rhel-9-for-ppc64le-baseos-e4s-rpms__9_DOT_6
+      s390x: rhel-9-for-s390x-baseos-e4s-rpms__9_DOT_6
     reposync:
       enabled: true
 
   rhel-96-appstream:
     conf:
       baseurl:
-        x86_64: https://rhsm-pulp.corp.redhat.com/content/eus/rhel9/9.6/x86_64/appstream/os/
-        aarch64: https://rhsm-pulp.corp.redhat.com/content/eus/rhel9/9.6/aarch64/appstream/os/
-        ppc64le: https://rhsm-pulp.corp.redhat.com/content/eus/rhel9/9.6/ppc64le/appstream/os/
-        s390x: https://rhsm-pulp.corp.redhat.com/content/eus/rhel9/9.6/s390x/appstream/os/
+        x86_64: https://rhsm-pulp.corp.redhat.com/content/e4s/rhel9/9.6/x86_64/appstream/os/
+        aarch64: https://rhsm-pulp.corp.redhat.com/content/e4s/rhel9/9.6/aarch64/appstream/os/
+        ppc64le: https://rhsm-pulp.corp.redhat.com/content/e4s/rhel9/9.6/ppc64le/appstream/os/
+        s390x: https://rhsm-pulp.corp.redhat.com/content/e4s/rhel9/9.6/s390x/appstream/os/
       extra_options:
         gpgcheck: "1"
     content_set:
-      default: rhel-9-for-x86_64-appstream-eus-rpms__9_DOT_6
-      aarch64: rhel-9-for-aarch64-appstream-eus-rpms__9_DOT_6
-      ppc64le: rhel-9-for-ppc64le-appstream-eus-rpms__9_DOT_6
-      s390x: rhel-9-for-s390x-appstream-eus-rpms__9_DOT_6
+      default: rhel-9-for-x86_64-appstream-e4s-rpms__9_DOT_6
+      aarch64: rhel-9-for-aarch64-appstream-e4s-rpms__9_DOT_6
+      ppc64le: rhel-9-for-ppc64le-appstream-e4s-rpms__9_DOT_6
+      s390x: rhel-9-for-s390x-appstream-e4s-rpms__9_DOT_6
     reposync:
       enabled: true
 
@@ -555,10 +555,10 @@ repos:
       extra_options:
         gpgcheck: "1"
     content_set:
-      default: rhel-9-for-x86_64-highavailability-eus-rpms__9_DOT_6
-      aarch64: rhel-9-for-aarch64-highavailability-eus-rpms__9_DOT_6
-      ppc64le: rhel-9-for-ppc64le-highavailability-eus-rpms__9_DOT_6
-      s390x: rhel-9-for-s390x-highavailability-eus-rpms__9_DOT_6
+      default: rhel-9-for-x86_64-highavailability-e4s-rpms__9_DOT_6
+      aarch64: rhel-9-for-aarch64-highavailability-e4s-rpms__9_DOT_6
+      ppc64le: rhel-9-for-ppc64le-highavailability-e4s-rpms__9_DOT_6
+      s390x: rhel-9-for-s390x-highavailability-e4s-rpms__9_DOT_6
     reposync:
       enabled: true
   rhel-100-baseos:
diff --git a/images/openshift-base-rhel9.yml b/images/openshift-base-rhel9.yml
index cdbe7907b..c38406973 100644
--- a/images/openshift-base-rhel9.yml
+++ b/images/openshift-base-rhel9.yml
@@ -27,6 +27,7 @@ distgit:
 enabled_repos:
 - rhel-9-baseos-rpms
 - rhel-9-appstream-rpms
+- rhel-9-codeready-builder-rpms
   # sometimes we ship RHEL content ahead of RHEL (usually for RHCOS).
   # update with that content too so we avoid out-of-date assembly issues:
 - rhel-9-server-ose-rpms-embargoed