diff --git a/images/driver-toolkit.yml b/images/driver-toolkit.yml
index b1a579ebd3..c2acbf38fe 100644
--- a/images/driver-toolkit.yml
+++ b/images/driver-toolkit.yml
@@ -31,3 +31,5 @@ from:
 name: openshift/ose-driver-toolkit
 owners:
 - edge-sro@redhat.com
+non_shipping_repos:
+- rhel-8-server-ose-rpms-embargoed
diff --git a/images/openshift-base-rhel8.yml b/images/openshift-base-rhel8.yml
index 8ddd39696a..7f63a9d83d 100644
--- a/images/openshift-base-rhel8.yml
+++ b/images/openshift-base-rhel8.yml
@@ -25,9 +25,6 @@ content:
 enabled_repos:
 - rhel-8-appstream-rpms
 - rhel-8-baseos-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
 for_payload: false
 for_release: false
 from:
diff --git a/images/openshift-enterprise-tests.yml b/images/openshift-enterprise-tests.yml
index b2137a8b5a..aede7204d2 100644
--- a/images/openshift-enterprise-tests.yml
+++ b/images/openshift-enterprise-tests.yml
@@ -30,8 +30,7 @@ from:
   member: ose-tools
 labels:
   License: GPLv2+
-  io.k8s.description: OpenShift is a platform for developing, building, and deploying
-    containerized applications.
+  io.k8s.description: OpenShift is a platform for developing, building, and deploying containerized applications.
   io.k8s.display-name: OpenShift End-to-End Tests
   io.openshift.tags: openshift,tests,e2e
   vendor: Red Hat
diff --git a/images/openshift-kubernetes-nmstate-handler.yml b/images/openshift-kubernetes-nmstate-handler.yml
index 3132585b8b..edc7c20ce9 100644
--- a/images/openshift-kubernetes-nmstate-handler.yml
+++ b/images/openshift-kubernetes-nmstate-handler.yml
@@ -31,3 +31,5 @@ owners:
 - ellorent@redhat.com
 - phoracek@redhat.com
 - yboaron@redhat.com
+non_shipping_repos:
+- rhel-8-server-ose-rpms-embargoed
diff --git a/images/ose-frr.yml b/images/ose-frr.yml
index 396d7db420..0fe992f445 100644
--- a/images/ose-frr.yml
+++ b/images/ose-frr.yml
@@ -19,3 +19,5 @@ name: openshift/frr-rhel8
 name_in_bundle: metallb-frr-rhel8
 owners:
 - metallb-dev@redhat.com
+non_shipping_repos:
+- rhel-8-server-ose-rpms-embargoed
diff --git a/images/ose-image-customization-controller.yml b/images/ose-image-customization-controller.yml
index fa2b77dca8..eb3b9d68c0 100644
--- a/images/ose-image-customization-controller.yml
+++ b/images/ose-image-customization-controller.yml
@@ -23,5 +23,3 @@ from:
 name: openshift/ose-image-customization-controller
 owners:
 - metal-platform@redhat.com
-non_shipping_repos:
-- rhel-8-server-ose-rpms-embargoed
diff --git a/images/ose-metallb-operator.yml b/images/ose-metallb-operator.yml
index f88a609880..f3ce5f4b5a 100644
--- a/images/ose-metallb-operator.yml
+++ b/images/ose-metallb-operator.yml
@@ -25,5 +25,4 @@ update-csv:
   bundle-dir: '{MAJOR}.{MINOR}/'
   manifests-dir: manifests/
   registry: image-registry.openshift-image-registry.svc:5000
-  valid-subscription-label: '["OpenShift Kubernetes Engine", "OpenShift Container
-    Platform", "OpenShift Platform Plus"]'
+  valid-subscription-label: '["OpenShift Kubernetes Engine", "OpenShift Container Platform", "OpenShift Platform Plus"]'
diff --git a/images/ose-ovn-kubernetes.yml b/images/ose-ovn-kubernetes.yml
index 18631c21d1..e0e425e998 100644
--- a/images/ose-ovn-kubernetes.yml
+++ b/images/ose-ovn-kubernetes.yml
@@ -40,8 +40,7 @@ from:
   member: openshift-enterprise-base
 labels:
   License: GPLv2+
-  io.k8s.description: This is a component of OpenShift Container Platform that provides
-    an overlay network using ovn.
+  io.k8s.description: This is a component of OpenShift Container Platform that provides an overlay network using ovn.
   io.k8s.display-name: ovn kubernetes
   io.openshift.tags: openshift
   vendor: Red Hat
diff --git a/images/ose-tools.yml b/images/ose-tools.yml
index e4b3a0ac0c..f556b348dc 100644
--- a/images/ose-tools.yml
+++ b/images/ose-tools.yml
@@ -21,8 +21,7 @@ from:
   member: openshift-enterprise-cli
 labels:
   License: GPLv2+
-  io.k8s.description: Contains debugging and diagnostic tools for use with an OpenShift
-    cluster.
+  io.k8s.description: Contains debugging and diagnostic tools for use with an OpenShift cluster.
   io.k8s.display-name: OpenShift Tools
   io.openshift.tags: openshift,tools
   vendor: Red Hat