diff --git a/group.yml b/group.yml
index 8b2cd4e55..5226b20e9 100644
--- a/group.yml
+++ b/group.yml
@@ -272,20 +272,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
 
@@ -383,20 +383,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
 
@@ -405,20 +405,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
 
diff --git a/images/openshift-base-rhel8.yml b/images/openshift-base-rhel8.yml
index beb24b158..83024aab5 100644
--- a/images/openshift-base-rhel8.yml
+++ b/images/openshift-base-rhel8.yml
@@ -32,6 +32,7 @@ distgit:
 enabled_repos:
 - rhel-8-baseos-rpms
 - rhel-8-appstream-rpms
+- rhel-8-codeready-builder-rpms
 for_payload: false
 for_release: false
 from:
diff --git a/images/openshift-base-rhel9.yml b/images/openshift-base-rhel9.yml
index 0bd9f7196..ecefad28f 100644
--- a/images/openshift-base-rhel9.yml
+++ b/images/openshift-base-rhel9.yml
@@ -31,6 +31,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