diff --git a/group.yml b/group.yml
index e73e05883d..00005fd57d 100644
--- a/group.yml
+++ b/group.yml
@@ -240,20 +240,20 @@ repos:
   rhel-8-codeready-builder-rpms:
     conf:
       baseurl:
-        aarch64: https://rhsm-pulp.corp.redhat.com/content/eus/rhel8/8.6/aarch64/codeready-builder/os/
-        ppc64le: https://rhsm-pulp.corp.redhat.com/content/eus/rhel8/8.6/ppc64le/codeready-builder/os/
-        s390x:   https://rhsm-pulp.corp.redhat.com/content/eus/rhel8/8.6/s390x/codeready-builder/os/
-        x86_64:  https://rhsm-pulp.corp.redhat.com/content/eus/rhel8/8.6/x86_64/codeready-builder/os/
+        aarch64: https://rhsm-pulp.corp.redhat.com/content/e4s/rhel8/8.6/aarch64/codeready-builder/os/
+        ppc64le: https://rhsm-pulp.corp.redhat.com/content/e4s/rhel8/8.6/ppc64le/codeready-builder/os/
+        s390x:   https://rhsm-pulp.corp.redhat.com/content/e4s/rhel8/8.6/s390x/codeready-builder/os/
+        x86_64:  https://rhsm-pulp.corp.redhat.com/content/e4s/rhel8/8.6/x86_64/codeready-builder/os/
       ci_alignment:
         profiles:
         - el8
         localdev:
           enabled: true
     content_set:
-      default: codeready-builder-for-rhel-8-x86_64-eus-rpms__8_DOT_6
-      aarch64: codeready-builder-for-rhel-8-aarch64-eus-rpms__8_DOT_6
-      ppc64le: codeready-builder-for-rhel-8-ppc64le-eus-rpms__8_DOT_6
-      s390x:   codeready-builder-for-rhel-8-s390x-eus-rpms__8_DOT_6
+      default: codeready-builder-for-rhel-8-x86_64-e4s-rpms__8_DOT_6
+      aarch64: codeready-builder-for-rhel-8-aarch64-e4s-rpms__8_DOT_6
+      ppc64le: codeready-builder-for-rhel-8-ppc64le-e4s-rpms__8_DOT_6
+      s390x:   codeready-builder-for-rhel-8-s390x-e4s-rpms__8_DOT_6
     reposync:
       enabled: false
 
diff --git a/images/openshift-base-rhel8.yml b/images/openshift-base-rhel8.yml
index 0052f0d2aa..22f7cc645f 100644
--- a/images/openshift-base-rhel8.yml
+++ b/images/openshift-base-rhel8.yml
@@ -25,6 +25,7 @@ content:
 enabled_repos:
 - rhel-8-baseos-rpms
 - rhel-8-appstream-rpms
+- rhel-8-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-8-server-ose-rpms-embargoed
diff --git a/images/openshift-base-rhel9.yml b/images/openshift-base-rhel9.yml
index bf0f3df0c4..80f11e0024 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
 for_payload: false
 for_release: false
 from: