diff --git a/SOURCES/001-rhel-shortnames-pyxis.conf b/SOURCES/001-rhel-shortnames-pyxis.conf
index da12478..acf0079 100644
--- a/SOURCES/001-rhel-shortnames-pyxis.conf
+++ b/SOURCES/001-rhel-shortnames-pyxis.conf
@@ -1,11 +1,8 @@
 [aliases]
 "2ndquadrant/cloud-native-postgresql" = "quay.io/2ndquadrant/cloud-native-postgresql"
-"3scale-amp2/3scale-rhel7-operator-metadata" = "registry.redhat.io/3scale-amp2/3scale-rhel7-operator-metadata"
 "3scale-amp2/3scale-rhel7-operator" = "registry.redhat.io/3scale-amp2/3scale-rhel7-operator"
+"3scale-amp2/3scale-rhel7-operator-metadata" = "registry.redhat.io/3scale-amp2/3scale-rhel7-operator-metadata"
 "3scale-amp2/3scale-rhel8-operator" = "registry.redhat.io/3scale-amp2/3scale-rhel8-operator"
-"3scale-amp24/wildcard-router" = "registry.access.redhat.com/3scale-amp24/wildcard-router"
-"3scale-amp25/memcached" = "registry.access.redhat.com/3scale-amp25/memcached"
-"3scale-amp26/memcached" = "registry.redhat.io/3scale-amp26/memcached"
 "3scale-amp2/apicast-gateway-rhel8" = "registry.redhat.io/3scale-amp2/apicast-gateway-rhel8"
 "3scale-amp2/apicast-rhel7-operator" = "registry.redhat.io/3scale-amp2/apicast-rhel7-operator"
 "3scale-amp2/backend-rhel7" = "registry.redhat.io/3scale-amp2/backend-rhel7"
@@ -13,25 +10,29 @@
 "3scale-amp2/system-rhel7" = "registry.redhat.io/3scale-amp2/system-rhel7"
 "3scale-amp2/toolbox-rhel7" = "registry.redhat.io/3scale-amp2/toolbox-rhel7"
 "3scale-amp2/zync-rhel7" = "registry.redhat.io/3scale-amp2/zync-rhel7"
+"3scale-amp24/wildcard-router" = "registry.access.redhat.com/3scale-amp24/wildcard-router"
+"3scale-amp25/memcached" = "registry.access.redhat.com/3scale-amp25/memcached"
+"3scale-amp26/memcached" = "registry.redhat.io/3scale-amp26/memcached"
 "advanced-cluster-security/rhacs-main-rhel8" = "registry.redhat.io/advanced-cluster-security/rhacs-main-rhel8"
 "advanced-cluster-security/rhacs-operator-bundle" = "registry.redhat.io/advanced-cluster-security/rhacs-operator-bundle"
 "advanced-cluster-security/rhacs-rhel8-operator" = "registry.access.redhat.com/advanced-cluster-security/rhacs-rhel8-operator"
 "allegroai/trains-0-15" = "registry.redhat.io/allegroai/trains-0-15"
-"allegroai/trains-server-operator" = "registry.connect.redhat.com/allegroai/trains-server-operator"
 "allegroai/trains-server" = "registry.connect.redhat.com/allegroai/trains-server"
+"allegroai/trains-server-operator" = "registry.connect.redhat.com/allegroai/trains-server-operator"
+"amq7/amq-broker" = "registry.redhat.io/amq7/amq-broker"
 "amq7/amq-broker-init-openj9-11-rhel8" = "registry.redhat.io/amq7/amq-broker-init-openj9-11-rhel8"
 "amq7/amq-broker-init-rhel7" = "registry.redhat.io/amq7/amq-broker-init-rhel7"
 "amq7/amq-broker-init-rhel8" = "registry.redhat.io/amq7/amq-broker-init-rhel8"
 "amq7/amq-broker-openj9-11-rhel8" = "registry.redhat.io/amq7/amq-broker-openj9-11-rhel8"
 "amq7/amq-broker-operator-bundle" = "registry.redhat.io/amq7/amq-broker-operator-bundle"
-"amq7/amq-broker" = "registry.redhat.io/amq7/amq-broker"
 "amq7/amq-broker-rhel7-operator" = "registry.redhat.io/amq7/amq-broker-rhel7-operator"
-"amq7/amq-broker-rhel8-operator-bundle" = "registry.redhat.io/amq7/amq-broker-rhel8-operator-bundle"
-"amq7/amq-broker-rhel8-operator" = "registry.redhat.io/amq7/amq-broker-rhel8-operator"
 "amq7/amq-broker-rhel8" = "registry.redhat.io/amq7/amq-broker-rhel8"
+"amq7/amq-broker-rhel8-operator" = "registry.redhat.io/amq7/amq-broker-rhel8-operator"
+"amq7/amq-broker-rhel8-operator-bundle" = "registry.redhat.io/amq7/amq-broker-rhel8-operator-bundle"
 "amq7/amq-cert-manager" = "registry.redhat.io/amq7/amq-cert-manager"
-"amq7/amq-interconnect-operator" = "registry.redhat.io/amq7/amq-interconnect-operator"
+"amq7/amq-cert-manager-operator-bundle" = "registry.redhat.io/amq7/amq-cert-manager-operator-bundle"
 "amq7/amq-interconnect" = "registry.access.redhat.com/amq7/amq-interconnect"
+"amq7/amq-interconnect-operator" = "registry.redhat.io/amq7/amq-interconnect-operator"
 "amq7/amq-online-1-address-space-controller" = "registry.access.redhat.com/amq7/amq-online-1-address-space-controller"
 "amq7/amq-online-1-agent" = "registry.access.redhat.com/amq7/amq-online-1-agent"
 "amq7/amq-online-1-auth-plugin" = "registry.access.redhat.com/amq7/amq-online-1-auth-plugin"
@@ -44,26 +45,29 @@
 "amq7/amq-online-1-standard-controller" = "registry.access.redhat.com/amq7/amq-online-1-standard-controller"
 "amq7/amq-online-1-topic-forwarder" = "registry.access.redhat.com/amq7/amq-online-1-topic-forwarder"
 "amq7/amq-streams-bridge-rhel7" = "registry.redhat.io/amq7/amq-streams-bridge-rhel7"
+"amq7/amq-streams-bridge-rhel8" = "registry.redhat.io/amq7/amq-streams-bridge-rhel8"
 "amq7/amq-streams-kafka-25-rhel7" = "registry.redhat.io/amq7/amq-streams-kafka-25-rhel7"
 "amq7/amq-streams-kafka-26-rhel7" = "registry.redhat.io/amq7/amq-streams-kafka-26-rhel7"
 "amq7/amq-streams-kafka-27-rhel7" = "registry.redhat.io/amq7/amq-streams-kafka-27-rhel7"
+"amq7/amq-streams-kafka-27-rhel8" = "registry.redhat.io/amq7/amq-streams-kafka-27-rhel8"
+"amq7/amq-streams-kafka-28-rhel8" = "registry.redhat.io/amq7/amq-streams-kafka-28-rhel8"
 "amq7/amq-streams-operator-operator" = "registry.redhat.io/amq7/amq-streams-operator-operator"
-"amq7/amqstreams-rhel7-operator-metadata" = "registry.redhat.io/amq7/amqstreams-rhel7-operator-metadata"
 "amq7/amq-streams-rhel7-operator" = "registry.redhat.io/amq7/amq-streams-rhel7-operator"
 "amq7/amq-streams-rhel8-operator" = "registry.redhat.io/amq7/amq-streams-rhel8-operator"
+"amq7/amqstreams-rhel7-operator-metadata" = "registry.redhat.io/amq7/amqstreams-rhel7-operator-metadata"
 "amq7/ams-interconnect" = "registry.access.redhat.com/amq7/ams-interconnect"
 "anchore/engine4" = "registry.connect.redhat.com/anchore/engine4"
 "anchore/enterprise-operator" = "registry.redhat.io/anchore/enterprise-operator"
 "ansible-automation-platform-20-early-access/ansible-builder-rhel8" = "registry.redhat.io/ansible-automation-platform-20-early-access/ansible-builder-rhel8"
 "ansible-automation-platform-20-early-access/ansible-python-base-rhel8" = "registry.redhat.io/ansible-automation-platform-20-early-access/ansible-python-base-rhel8"
 "ansible-automation-platform-20-early-access/ansible-python-toolkit-rhel8" = "registry.redhat.io/ansible-automation-platform-20-early-access/ansible-python-toolkit-rhel8"
-"ansible-automation-platform-20-early-access/controller-rhel8-operator" = "registry.redhat.io/ansible-automation-platform-20-early-access/controller-rhel8-operator"
 "ansible-automation-platform-20-early-access/controller-rhel8" = "registry.redhat.io/ansible-automation-platform-20-early-access/controller-rhel8"
+"ansible-automation-platform-20-early-access/controller-rhel8-operator" = "registry.redhat.io/ansible-automation-platform-20-early-access/controller-rhel8-operator"
 "ansible-automation-platform-20-early-access/ee-29-rhel8" = "registry.redhat.io/ansible-automation-platform-20-early-access/ee-29-rhel8"
 "ansible-automation-platform-20-early-access/ee-minimal-rhel8" = "registry.redhat.io/ansible-automation-platform-20-early-access/ee-minimal-rhel8"
 "ansible-automation-platform-20-early-access/ee-supported-rhel8" = "registry.redhat.io/ansible-automation-platform-20-early-access/ee-supported-rhel8"
-"ansible-automation-platform-20-early-access/hub-rhel8-operator" = "registry.redhat.io/ansible-automation-platform-20-early-access/hub-rhel8-operator"
 "ansible-automation-platform-20-early-access/hub-rhel8" = "registry.redhat.io/ansible-automation-platform-20-early-access/hub-rhel8"
+"ansible-automation-platform-20-early-access/hub-rhel8-operator" = "registry.redhat.io/ansible-automation-platform-20-early-access/hub-rhel8-operator"
 "ansible-automation-platform-20-early-access/hub-web-rhel8" = "registry.redhat.io/ansible-automation-platform-20-early-access/hub-web-rhel8"
 "ansible-automation-platform-20-early-access/platform-resource-rhel8-operator" = "registry.redhat.io/ansible-automation-platform-20-early-access/platform-resource-rhel8-operator"
 "ansible-automation-platform-20-early-access/platform-resource-runner-rhel8" = "registry.redhat.io/ansible-automation-platform-20-early-access/platform-resource-runner-rhel8"
@@ -86,26 +90,12 @@
 "blackducksoftware/opssight-pod-processor" = "registry.connect.redhat.com/blackducksoftware/opssight-pod-processor"
 "blackducksoftware/opssight-scanner" = "registry.connect.redhat.com/blackducksoftware/opssight-scanner"
 "blackducksoftware/synopsys-operator" = "registry.redhat.io/blackducksoftware/synopsys-operator"
-"c12e/cortex5-accounts" = "registry.connect.redhat.com/c12e/cortex5-accounts"
-"c12e/cortex5-actions" = "registry.connect.redhat.com/c12e/cortex5-actions"
-"c12e/cortex5-agents" = "registry.connect.redhat.com/c12e/cortex5-agents"
-"c12e/cortex5-connections" = "registry.connect.redhat.com/c12e/cortex5-connections"
-"c12e/cortex5-connection-type-loader" = "registry.connect.redhat.com/c12e/cortex5-connection-type-loader"
-"c12e/cortex5-datasets" = "registry.connect.redhat.com/c12e/cortex5-datasets"
-"c12e/cortex5-docs" = "registry.connect.redhat.com/c12e/cortex5-docs"
-"c12e/cortex5-fabric-operator" = "registry.connect.redhat.com/c12e/cortex5-fabric-operator"
-"c12e/cortex5-graph" = "registry.connect.redhat.com/c12e/cortex5-graph"
-"c12e/cortex5-logs" = "registry.connect.redhat.com/c12e/cortex5-logs"
-"c12e/cortex5-models" = "registry.connect.redhat.com/c12e/cortex5-models"
-"c12e/cortex5-operator" = "registry.redhat.io/c12e/cortex5-operator"
-"c12e/cortex5-processor-gateway" = "registry.connect.redhat.com/c12e/cortex5-processor-gateway"
-"c12e/cortex5-sessions" = "registry.connect.redhat.com/c12e/cortex5-sessions"
 "c12e/cortex-accounts-service" = "registry.connect.redhat.com/c12e/cortex-accounts-service"
 "c12e/cortex-actions-service" = "registry.connect.redhat.com/c12e/cortex-actions-service"
 "c12e/cortex-admin-ui" = "registry.connect.redhat.com/c12e/cortex-admin-ui"
 "c12e/cortex-agents-service" = "registry.connect.redhat.com/c12e/cortex-agents-service"
-"c12e/cortex-connections-service" = "registry.connect.redhat.com/c12e/cortex-connections-service"
 "c12e/cortex-connection-type-loader" = "registry.connect.redhat.com/c12e/cortex-connection-type-loader"
+"c12e/cortex-connections-service" = "registry.connect.redhat.com/c12e/cortex-connections-service"
 "c12e/cortex-datasets-service" = "registry.connect.redhat.com/c12e/cortex-datasets-service"
 "c12e/cortex-docs" = "registry.connect.redhat.com/c12e/cortex-docs"
 "c12e/cortex-graph" = "registry.connect.redhat.com/c12e/cortex-graph"
@@ -115,6 +105,20 @@
 "c12e/cortex-models-service" = "registry.connect.redhat.com/c12e/cortex-models-service"
 "c12e/cortex-processor-gateway" = "registry.connect.redhat.com/c12e/cortex-processor-gateway"
 "c12e/cortex-sessions" = "registry.connect.redhat.com/c12e/cortex-sessions"
+"c12e/cortex5-accounts" = "registry.connect.redhat.com/c12e/cortex5-accounts"
+"c12e/cortex5-actions" = "registry.connect.redhat.com/c12e/cortex5-actions"
+"c12e/cortex5-agents" = "registry.connect.redhat.com/c12e/cortex5-agents"
+"c12e/cortex5-connection-type-loader" = "registry.connect.redhat.com/c12e/cortex5-connection-type-loader"
+"c12e/cortex5-connections" = "registry.connect.redhat.com/c12e/cortex5-connections"
+"c12e/cortex5-datasets" = "registry.connect.redhat.com/c12e/cortex5-datasets"
+"c12e/cortex5-docs" = "registry.connect.redhat.com/c12e/cortex5-docs"
+"c12e/cortex5-fabric-operator" = "registry.connect.redhat.com/c12e/cortex5-fabric-operator"
+"c12e/cortex5-graph" = "registry.connect.redhat.com/c12e/cortex5-graph"
+"c12e/cortex5-logs" = "registry.connect.redhat.com/c12e/cortex5-logs"
+"c12e/cortex5-models" = "registry.connect.redhat.com/c12e/cortex5-models"
+"c12e/cortex5-operator" = "registry.redhat.io/c12e/cortex5-operator"
+"c12e/cortex5-processor-gateway" = "registry.connect.redhat.com/c12e/cortex5-processor-gateway"
+"c12e/cortex5-sessions" = "registry.connect.redhat.com/c12e/cortex5-sessions"
 "calico/cni" = "quay.io/calico/cni"
 "calico/dikastes" = "quay.io/calico/dikastes"
 "calico/kube-controllers" = "quay.io/calico/kube-controllers"
@@ -127,24 +131,24 @@
 "cloudforms50/cfme-amazon-smartstate-rhel8" = "registry.redhat.io/cloudforms50/cfme-amazon-smartstate-rhel8"
 "cloudforms50/v2v-conversion-host-rhel8" = "registry.redhat.io/cloudforms50/v2v-conversion-host-rhel8"
 "cloudhedge/ch-operator" = "registry.connect.redhat.com/cloudhedge/ch-operator"
-"cnvrg-core/cnvrg" = "registry.connect.redhat.com/cnvrg-core/cnvrg"
 "cnv-tech-preview/virt-launcher-cpaas-mvp" = "registry.redhat.io/cnv-tech-preview/virt-launcher-cpaas-mvp"
-"cockroachdb/cockroachdb-operator-bundle" = "registry.connect.redhat.com/cockroachdb/cockroachdb-operator-bundle"
+"cnvrg-core/cnvrg" = "registry.connect.redhat.com/cnvrg-core/cnvrg"
 "cockroachdb/cockroachdb-operator" = "registry.redhat.io/cockroachdb/cockroachdb-operator"
+"cockroachdb/cockroachdb-operator-bundle" = "registry.connect.redhat.com/cockroachdb/cockroachdb-operator-bundle"
 "codeready-workspaces/crw-2-rhel8-operator" = "registry.redhat.io/codeready-workspaces/crw-2-rhel8-operator"
 "codeready-workspaces/dashboard-rhel8" = "registry.redhat.io/codeready-workspaces/dashboard-rhel8"
 "codeready-workspaces/devfileregistry-rhel8" = "registry.redhat.io/codeready-workspaces/devfileregistry-rhel8"
 "codeready-workspaces/imagepuller-rhel8" = "registry.redhat.io/codeready-workspaces/imagepuller-rhel8"
 "codeready-workspaces/jwtproxy-rhel8" = "registry.redhat.io/codeready-workspaces/jwtproxy-rhel8"
 "codeready-workspaces/machineexec-rhel8" = "registry.redhat.io/codeready-workspaces/machineexec-rhel8"
-"codeready-workspaces/pluginbroker-artifacts-rhel8" = "registry.redhat.io/codeready-workspaces/pluginbroker-artifacts-rhel8"
-"codeready-workspaces/pluginbroker-metadata-rhel8" = "registry.redhat.io/codeready-workspaces/pluginbroker-metadata-rhel8"
 "codeready-workspaces/plugin-java11-openj9-rhel8" = "registry.redhat.io/codeready-workspaces/plugin-java11-openj9-rhel8"
 "codeready-workspaces/plugin-java11-rhel8" = "registry.redhat.io/codeready-workspaces/plugin-java11-rhel8"
 "codeready-workspaces/plugin-java8-openj9-rhel8" = "registry.redhat.io/codeready-workspaces/plugin-java8-openj9-rhel8"
 "codeready-workspaces/plugin-java8-rhel8" = "registry.redhat.io/codeready-workspaces/plugin-java8-rhel8"
 "codeready-workspaces/plugin-kubernetes-rhel8" = "registry.redhat.io/codeready-workspaces/plugin-kubernetes-rhel8"
 "codeready-workspaces/plugin-openshift-rhel8" = "registry.redhat.io/codeready-workspaces/plugin-openshift-rhel8"
+"codeready-workspaces/pluginbroker-artifacts-rhel8" = "registry.redhat.io/codeready-workspaces/pluginbroker-artifacts-rhel8"
+"codeready-workspaces/pluginbroker-metadata-rhel8" = "registry.redhat.io/codeready-workspaces/pluginbroker-metadata-rhel8"
 "codeready-workspaces/pluginregistry-rhel8" = "registry.redhat.io/codeready-workspaces/pluginregistry-rhel8"
 "codeready-workspaces/server-rhel8" = "registry.redhat.io/codeready-workspaces/server-rhel8"
 "codeready-workspaces/theia-endpoint-rhel8" = "registry.redhat.io/codeready-workspaces/theia-endpoint-rhel8"
@@ -162,8 +166,8 @@
 "container-native-virtualization/cnv-containernetworking-plugins" = "registry.redhat.io/container-native-virtualization/cnv-containernetworking-plugins"
 "container-native-virtualization/cnv-must-gather-rhel8" = "registry.redhat.io/container-native-virtualization/cnv-must-gather-rhel8"
 "container-native-virtualization/hco-bundle-registry" = "registry.redhat.io/container-native-virtualization/hco-bundle-registry"
-"container-native-virtualization/hostpath-provisioner-rhel8-operator" = "registry.redhat.io/container-native-virtualization/hostpath-provisioner-rhel8-operator"
 "container-native-virtualization/hostpath-provisioner-rhel8" = "registry.redhat.io/container-native-virtualization/hostpath-provisioner-rhel8"
+"container-native-virtualization/hostpath-provisioner-rhel8-operator" = "registry.redhat.io/container-native-virtualization/hostpath-provisioner-rhel8-operator"
 "container-native-virtualization/hyperconverged-cluster-operator" = "registry.redhat.io/container-native-virtualization/hyperconverged-cluster-operator"
 "container-native-virtualization/hyperconverged-cluster-webhook-rhel8" = "registry.redhat.io/container-native-virtualization/hyperconverged-cluster-webhook-rhel8"
 "container-native-virtualization/kubemacpool" = "registry.redhat.io/container-native-virtualization/kubemacpool"
@@ -190,9 +194,9 @@
 "container-native-virtualization/virt-cdi-uploadserver" = "registry.redhat.io/container-native-virtualization/virt-cdi-uploadserver"
 "container-native-virtualization/virt-controller" = "registry.redhat.io/container-native-virtualization/virt-controller"
 "container-native-virtualization/virt-handler" = "registry.redhat.io/container-native-virtualization/virt-handler"
-"container-native-virtualization/virtio-win" = "registry.redhat.io/container-native-virtualization/virtio-win"
 "container-native-virtualization/virt-launcher" = "registry.redhat.io/container-native-virtualization/virt-launcher"
 "container-native-virtualization/virt-operator" = "registry.redhat.io/container-native-virtualization/virt-operator"
+"container-native-virtualization/virtio-win" = "registry.redhat.io/container-native-virtualization/virtio-win"
 "container-native-virtualization/vm-import-controller" = "registry.redhat.io/container-native-virtualization/vm-import-controller"
 "container-native-virtualization/vm-import-controller-rhel8" = "registry.redhat.io/container-native-virtualization/vm-import-controller-rhel8"
 "container-native-virtualization/vm-import-operator-rhel8" = "registry.redhat.io/container-native-virtualization/vm-import-operator-rhel8"
@@ -209,13 +213,13 @@
 "datacore-software/openstack-cinder-volume-datacore-rhosp-16-1" = "registry.redhat.io/datacore-software/openstack-cinder-volume-datacore-rhosp-16-1"
 "datagrid/datagrid-8-openj9-11-rhel8" = "registry.redhat.io/datagrid/datagrid-8-openj9-11-rhel8"
 "datagrid/datagrid-8-prod-operator-bundle" = "registry.redhat.io/datagrid/datagrid-8-prod-operator-bundle"
-"datagrid/datagrid-8-rhel8-operator" = "registry.redhat.io/datagrid/datagrid-8-rhel8-operator"
 "datagrid/datagrid-8-rhel8" = "registry.redhat.io/datagrid/datagrid-8-rhel8"
+"datagrid/datagrid-8-rhel8-operator" = "registry.redhat.io/datagrid/datagrid-8-rhel8-operator"
 "datera/rhosp13-openstack-cinder-volume-datera" = "registry.connect.redhat.com/datera/rhosp13-openstack-cinder-volume-datera"
 "datera/rhosp16-openstack-cinder-volume-datera" = "registry.connect.redhat.com/datera/rhosp16-openstack-cinder-volume-datera"
 "dellemc/openstack-manila-share-dellemc-rhosp14" = "registry.redhat.io/dellemc/openstack-manila-share-dellemc-rhosp14"
-"deployhub/deployhub-pro" = "registry.connect.redhat.com/deployhub/deployhub-pro"
 "deployhub/deployhub" = "registry.connect.redhat.com/deployhub/deployhub"
+"deployhub/deployhub-pro" = "registry.connect.redhat.com/deployhub/deployhub-pro"
 "devtools/go-toolset-rhel7" = "registry.access.redhat.com/devtools/go-toolset-rhel7"
 "devtools/llvm-toolset-60-rhel7" = "registry.access.redhat.com/devtools/llvm-toolset-60-rhel7"
 "distributed-tracing/jaeger-agent-rhel7" = "registry.redhat.io/distributed-tracing/jaeger-agent-rhel7"
@@ -243,8 +247,8 @@
 "dotnet/dotnet-31-runtime-rhel7" = "registry.redhat.io/dotnet/dotnet-31-runtime-rhel7"
 "dotscience/dotscience-deployer-ubi8" = "registry.connect.redhat.com/dotscience/dotscience-deployer-ubi8"
 "dotscience/operator-ubi8" = "registry.connect.redhat.com/dotscience/operator-ubi8"
-"dynatrace/dynatrace-oneagent-operator-0-1-0" = "registry.connect.redhat.com/dynatrace/dynatrace-oneagent-operator-0-1-0"
 "dynatrace/dynatrace-oneagent-operator" = "registry.connect.redhat.com/dynatrace/dynatrace-oneagent-operator"
+"dynatrace/dynatrace-oneagent-operator-0-1-0" = "registry.connect.redhat.com/dynatrace/dynatrace-oneagent-operator-0-1-0"
 "e2e-container/e2e-cve-rebuilds-library" = "registry.redhat.io/e2e-container/e2e-cve-rebuilds-library"
 "e2e-container/rhel-8-e2e-container-test-product" = "registry.access.redhat.com/e2e-container/rhel-8-e2e-container-test-product"
 "e2e-container/workflow-test" = "registry.access.redhat.com/e2e-container/workflow-test"
@@ -255,33 +259,34 @@
 "enterprisedb/edb-epas-lite11" = "registry.connect.redhat.com/enterprisedb/edb-epas-lite11"
 "enterprisedb/edb-pgpool" = "registry.redhat.io/enterprisedb/edb-pgpool"
 "esacalateai/cih-operator-bundle" = "registry.redhat.io/esacalateai/cih-operator-bundle"
+"fujitsu-postgres/fujitsu-enterprise-postgres-operator" = "registry.connect.redhat.com/fujitsu-postgres/fujitsu-enterprise-postgres-operator"
 "fujitsu/fujitsu-enterprise-postgres-12-backup" = "quay.io/fujitsu/fujitsu-enterprise-postgres-12-backup"
 "fujitsu/fujitsu-enterprise-postgres-12-operator" = "quay.io/fujitsu/fujitsu-enterprise-postgres-12-operator"
 "fujitsu/fujitsu-enterprise-postgres-12-pgpool2" = "quay.io/fujitsu/fujitsu-enterprise-postgres-12-pgpool2"
 "fujitsu/fujitsu-enterprise-postgres-12-restore" = "registry.redhat.io/fujitsu/fujitsu-enterprise-postgres-12-restore"
 "fujitsu/fujitsu-enterprise-postgres-12-server" = "quay.io/fujitsu/fujitsu-enterprise-postgres-12-server"
 "fujitsu/fujitsu-enterprise-postgres-operator" = "quay.io/fujitsu/fujitsu-enterprise-postgres-operator"
-"fujitsu-postgres/fujitsu-enterprise-postgres-operator" = "registry.connect.redhat.com/fujitsu-postgres/fujitsu-enterprise-postgres-operator"
-"fuse7/fuse-apicurito-generator" = "registry.access.redhat.com/fuse7/fuse-apicurito-generator"
-"fuse7/fuse-apicurito-operator-bundle" = "registry.redhat.io/fuse7/fuse-apicurito-operator-bundle"
-"fuse7/fuse-apicurito" = "registry.access.redhat.com/fuse7/fuse-apicurito"
-"fuse7/fuse-apicurito-rhel7-operator" = "registry.redhat.io/fuse7/fuse-apicurito-rhel7-operator"
-"fuse7/fuse-console-operator-bundle" = "registry.redhat.io/fuse7/fuse-console-operator-bundle"
-"fuse7/fuse-console" = "registry.access.redhat.com/fuse7/fuse-console"
-"fuse7/fuse-console-rhel7-operator" = "registry.redhat.io/fuse7/fuse-console-rhel7-operator"
+"fuse7/fuse-apicurito-generator-rhel8" = "registry.redhat.io/fuse7/fuse-apicurito-generator-rhel8"
+"fuse7/fuse-apicurito-rhel8" = "registry.redhat.io/fuse7/fuse-apicurito-rhel8"
+"fuse7/fuse-apicurito-rhel8-operator" = "registry.redhat.io/fuse7/fuse-apicurito-rhel8-operator"
+"fuse7/fuse-apicurito-rhel8-operator-bundle" = "registry.redhat.io/fuse7/fuse-apicurito-rhel8-operator-bundle"
+"fuse7/fuse-console-rhel7-operator-metadata" = "registry.redhat.io/fuse7/fuse-console-rhel7-operator-metadata"
+"fuse7/fuse-console-rhel8" = "registry.redhat.io/fuse7/fuse-console-rhel8"
+"fuse7/fuse-console-rhel8-operator" = "registry.redhat.io/fuse7/fuse-console-rhel8-operator"
+"fuse7/fuse-console-rhel8-operator-bundle" = "registry.redhat.io/fuse7/fuse-console-rhel8-operator-bundle"
 "fuse7/fuse-eap-openshift-jdk11-rhel8" = "registry.redhat.io/fuse7/fuse-eap-openshift-jdk11-rhel8"
-"fuse7/fuse-eap-openshift" = "registry.access.redhat.com/fuse7/fuse-eap-openshift"
-"fuse7/fuse-ignite-meta" = "registry.access.redhat.com/fuse7/fuse-ignite-meta"
-"fuse7/fuse-ignite-s2i" = "registry.access.redhat.com/fuse7/fuse-ignite-s2i"
-"fuse7/fuse-ignite-server" = "registry.access.redhat.com/fuse7/fuse-ignite-server"
-"fuse7/fuse-ignite-ui" = "registry.access.redhat.com/fuse7/fuse-ignite-ui"
-"fuse7/fuse-ignite-upgrade" = "registry.access.redhat.com/fuse7/fuse-ignite-upgrade"
+"fuse7/fuse-eap-openshift-jdk8-rhel7" = "registry.redhat.io/fuse7/fuse-eap-openshift-jdk8-rhel7"
 "fuse7/fuse-java-openshift-jdk11-rhel8" = "registry.redhat.io/fuse7/fuse-java-openshift-jdk11-rhel8"
-"fuse7/fuse-java-openshift" = "registry.access.redhat.com/fuse7/fuse-java-openshift"
-"fuse7/fuse-karaf-openshift" = "registry.access.redhat.com/fuse7/fuse-karaf-openshift"
-"fuse7/fuse-online-operator-bundle" = "registry.redhat.io/fuse7/fuse-online-operator-bundle"
-"fuse7/fuse-online-operator" = "registry.access.redhat.com/fuse7/fuse-online-operator"
-"fuse7/fuse-postgres-exporter-rhel7" = "registry.redhat.io/fuse7/fuse-postgres-exporter-rhel7"
+"fuse7/fuse-java-openshift-rhel8" = "registry.redhat.io/fuse7/fuse-java-openshift-rhel8"
+"fuse7/fuse-karaf-openshift-rhel8" = "registry.redhat.io/fuse7/fuse-karaf-openshift-rhel8"
+"fuse7/fuse-online-builder-rhel8" = "registry.redhat.io/fuse7/fuse-online-builder-rhel8"
+"fuse7/fuse-online-meta-rhel8" = "registry.redhat.io/fuse7/fuse-online-meta-rhel8"
+"fuse7/fuse-online-rhel8-operator" = "registry.redhat.io/fuse7/fuse-online-rhel8-operator"
+"fuse7/fuse-online-rhel8-operator-bundle" = "registry.redhat.io/fuse7/fuse-online-rhel8-operator-bundle"
+"fuse7/fuse-online-server-rhel8" = "registry.redhat.io/fuse7/fuse-online-server-rhel8"
+"fuse7/fuse-online-ui-rhel8" = "registry.redhat.io/fuse7/fuse-online-ui-rhel8"
+"fuse7/fuse-online-upgrade-rhel8" = "registry.redhat.io/fuse7/fuse-online-upgrade-rhel8"
+"fuse7/fuse-postgres-exporter-rhel8" = "registry.redhat.io/fuse7/fuse-postgres-exporter-rhel8"
 "genuitec/codetogether2-ubi8" = "registry.connect.redhat.com/genuitec/codetogether2-ubi8"
 "gigaspaces/insightedge-enterprise-14-0" = "registry.connect.redhat.com/gigaspaces/insightedge-enterprise-14-0"
 "gtsoftware/ivory-server" = "registry.connect.redhat.com/gtsoftware/ivory-server"
@@ -291,8 +296,8 @@
 "hpam-7/rhpam73-controller-openshift" = "registry.redhat.io/hpam-7/rhpam73-controller-openshift"
 "hpe3parcinder/hpe3parcinder16-1" = "registry.connect.redhat.com/hpe3parcinder/hpe3parcinder16-1"
 "hpe3parcinder/openstack-cinder-volume-hpe3parcinder16-1" = "registry.redhat.io/hpe3parcinder/openstack-cinder-volume-hpe3parcinder16-1"
-"hpestorage/xspc-csi-driver-operator" = "registry.connect.redhat.com/hpestorage/xspc-csi-driver-operator"
 "hpestorage/xspc-csi-driver" = "registry.connect.redhat.com/hpestorage/xspc-csi-driver"
+"hpestorage/xspc-csi-driver-operator" = "registry.connect.redhat.com/hpestorage/xspc-csi-driver-operator"
 "hpestorage/xspc-csi-operator-bundle" = "registry.redhat.io/hpestorage/xspc-csi-operator-bundle"
 "ibm/aspera-hsts-aej" = "registry.connect.redhat.com/ibm/aspera-hsts-aej"
 "ibm/aspera-hsts-ascp-server" = "registry.connect.redhat.com/ibm/aspera-hsts-ascp-server"
@@ -301,12 +306,12 @@
 "ibm/aspera-hsts-tcp-proxy" = "registry.connect.redhat.com/ibm/aspera-hsts-tcp-proxy"
 "ibm/aspera-hsts-utils" = "registry.connect.redhat.com/ibm/aspera-hsts-utils"
 "ibm/db2-eventstore" = "registry.connect.redhat.com/ibm/db2-eventstore"
-"ibm/ibm-cics-tx-on-cloud" = "registry.connect.redhat.com/ibm/ibm-cics-tx-on-cloud"
-"ibm/ibmjava8-sdko-ubi8" = "registry.connect.redhat.com/ibm/ibmjava8-sdko-ubi8"
-"ibm/ibmjava8-sdk-ubi8-minimal" = "registry.connect.redhat.com/ibm/ibmjava8-sdk-ubi8-minimal"
-"ibm/ibmjava8-sdk-ubi8" = "registry.connect.redhat.com/ibm/ibmjava8-sdk-ubi8"
+"ibm/ibm-cics-tx-on-cloud" = "registry.redhat.io/ibm/ibm-cics-tx-on-cloud"
 "ibm/ibm-spectrum-scale-csi-driver" = "registry.redhat.io/ibm/ibm-spectrum-scale-csi-driver"
 "ibm/ibm-spectrum-scale-csi-operator" = "registry.connect.redhat.com/ibm/ibm-spectrum-scale-csi-operator"
+"ibm/ibmjava8-sdk-ubi8" = "registry.connect.redhat.com/ibm/ibmjava8-sdk-ubi8"
+"ibm/ibmjava8-sdk-ubi8-minimal" = "registry.connect.redhat.com/ibm/ibmjava8-sdk-ubi8-minimal"
+"ibm/ibmjava8-sdko-ubi8" = "registry.connect.redhat.com/ibm/ibmjava8-sdko-ubi8"
 "ibm/operator-image" = "registry.connect.redhat.com/ibm/operator-image"
 "ibm/pai4sk" = "registry.redhat.io/ibm/pai4sk"
 "ibm/pfs-prod" = "registry.connect.redhat.com/ibm/pfs-prod"
@@ -315,25 +320,31 @@
 "ibm/transformation-advisor-operator-testproject" = "registry.redhat.io/ibm/transformation-advisor-operator-testproject"
 "infoblox/rhosp13-infoblox-ipam-agent" = "registry.redhat.io/infoblox/rhosp13-infoblox-ipam-agent"
 "instana/agent" = "registry.connect.redhat.com/instana/agent"
-"integration/camel-k-rhel8-operator-bundle" = "registry.redhat.io/integration/camel-k-rhel8-operator-bundle"
 "integration/camel-k-rhel8-operator" = "registry.redhat.io/integration/camel-k-rhel8-operator"
 "integration/rh-integration-operator-bundle" = "registry.redhat.io/integration/rh-integration-operator-bundle"
 "integration/rh-integration-rhel8-operator" = "registry.redhat.io/integration/rh-integration-rhel8-operator"
 "integration/rhi-rhel8-operator" = "registry.redhat.io/integration/rhi-rhel8-operator"
 "integration/service-registry-kafkasql-rhel8" = "registry.redhat.io/integration/service-registry-kafkasql-rhel8"
-"integration/service-registry-rhel8-operator-metadata" = "registry.redhat.io/integration/service-registry-rhel8-operator-metadata"
 "integration/service-registry-rhel8-operator" = "registry.redhat.io/integration/service-registry-rhel8-operator"
+"integration/service-registry-rhel8-operator-metadata" = "registry.redhat.io/integration/service-registry-rhel8-operator-metadata"
 "integration/service-registry-sql-rhel8" = "registry.redhat.io/integration/service-registry-sql-rhel8"
 "integration/service-registry-streams-rhel8" = "registry.redhat.io/integration/service-registry-streams-rhel8"
-"intel/tensorflow-mpi-horovod" = "registry.connect.redhat.com/intel/tensorflow-mpi-horovod"
 "intel/tensorflow" = "registry.redhat.io/intel/tensorflow"
+"intel/tensorflow-mpi-horovod" = "registry.connect.redhat.com/intel/tensorflow-mpi-horovod"
 "isovalent/operator-generic" = "registry.connect.redhat.com/isovalent/operator-generic"
 "jboss-amq-6/amq63-openshift" = "registry.access.redhat.com/jboss-amq-6/amq63-openshift"
-"jboss-datagrid-7/datagrid73-openj9-11-openshift-rhel8" = "registry.redhat.io/jboss-datagrid-7/datagrid73-openj9-11-openshift-rhel8"
-"jboss-datagrid-7/datagrid73-openshift" = "registry.access.redhat.com/jboss-datagrid-7/datagrid73-openshift"
 "jboss-datavirt-6/datavirt64-driver-openshift" = "registry.access.redhat.com/jboss-datavirt-6/datavirt64-driver-openshift"
 "jboss-datavirt-6/datavirt64-openshift" = "registry.access.redhat.com/jboss-datavirt-6/datavirt64-openshift"
-"jboss-eap-6/eap64-openshift" = "registry.access.redhat.com/jboss-eap-6/eap64-openshift"
+"jboss-eap-7/eap-xp2-openj9-11-openshift-rhel8" = "registry.redhat.io/jboss-eap-7/eap-xp2-openj9-11-openshift-rhel8"
+"jboss-eap-7/eap-xp2-openj9-11-runtime-openshift-rhel8" = "registry.redhat.io/jboss-eap-7/eap-xp2-openj9-11-runtime-openshift-rhel8"
+"jboss-eap-7/eap-xp2-openjdk11-openshift-rhel8" = "registry.redhat.io/jboss-eap-7/eap-xp2-openjdk11-openshift-rhel8"
+"jboss-eap-7/eap-xp2-openjdk11-runtime-openshift-rhel8" = "registry.redhat.io/jboss-eap-7/eap-xp2-openjdk11-runtime-openshift-rhel8"
+"jboss-eap-7/eap-xp2-openjdk8-openshift-rhel7" = "registry.redhat.io/jboss-eap-7/eap-xp2-openjdk8-openshift-rhel7"
+"jboss-eap-7/eap-xp2-openjdk8-runtime-openshift-rhel7" = "registry.redhat.io/jboss-eap-7/eap-xp2-openjdk8-runtime-openshift-rhel7"
+"jboss-eap-7/eap-xp3-openj9-11-openshift-rhel8" = "registry.redhat.io/jboss-eap-7/eap-xp3-openj9-11-openshift-rhel8"
+"jboss-eap-7/eap-xp3-openj9-11-runtime-openshift-rhel8" = "registry.redhat.io/jboss-eap-7/eap-xp3-openj9-11-runtime-openshift-rhel8"
+"jboss-eap-7/eap-xp3-openjdk11-openshift-rhel8" = "registry.redhat.io/jboss-eap-7/eap-xp3-openjdk11-openshift-rhel8"
+"jboss-eap-7/eap-xp3-openjdk11-runtime-openshift-rhel8" = "registry.redhat.io/jboss-eap-7/eap-xp3-openjdk11-runtime-openshift-rhel8"
 "jboss-eap-7/eap72-openj9-11-openshift-rhel8" = "registry.redhat.io/jboss-eap-7/eap72-openj9-11-openshift-rhel8"
 "jboss-eap-7/eap73-openj9-11-openshift-rhel8" = "registry.redhat.io/jboss-eap-7/eap73-openj9-11-openshift-rhel8"
 "jboss-eap-7/eap73-openj9-11-runtime-openshift-rhel8" = "registry.redhat.io/jboss-eap-7/eap73-openj9-11-runtime-openshift-rhel8"
@@ -341,41 +352,38 @@
 "jboss-eap-7/eap73-openjdk11-runtime-openshift-rhel8" = "registry.redhat.io/jboss-eap-7/eap73-openjdk11-runtime-openshift-rhel8"
 "jboss-eap-7/eap73-openjdk8-openshift-rhel7" = "registry.redhat.io/jboss-eap-7/eap73-openjdk8-openshift-rhel7"
 "jboss-eap-7/eap73-openjdk8-runtime-openshift-rhel7" = "registry.redhat.io/jboss-eap-7/eap73-openjdk8-runtime-openshift-rhel7"
-"jboss-eap-7/eap73-rhel8-operator-bundle" = "registry.redhat.io/jboss-eap-7/eap73-rhel8-operator-bundle"
 "jboss-eap-7/eap73-rhel8-operator" = "registry.redhat.io/jboss-eap-7/eap73-rhel8-operator"
+"jboss-eap-7/eap73-rhel8-operator-bundle" = "registry.redhat.io/jboss-eap-7/eap73-rhel8-operator-bundle"
+"jboss-eap-7/eap74-openj9-11-openshift-rhel8" = "registry.redhat.io/jboss-eap-7/eap74-openj9-11-openshift-rhel8"
+"jboss-eap-7/eap74-openj9-11-runtime-openshift-rhel8" = "registry.redhat.io/jboss-eap-7/eap74-openj9-11-runtime-openshift-rhel8"
 "jboss-eap-7/eap74-openjdk11-openshift-rhel8" = "registry.redhat.io/jboss-eap-7/eap74-openjdk11-openshift-rhel8"
+"jboss-eap-7/eap74-openjdk11-runtime-openshift-rhel8" = "registry.redhat.io/jboss-eap-7/eap74-openjdk11-runtime-openshift-rhel8"
 "jboss-eap-7/eap74-openjdk8-openshift-rhel7" = "registry.redhat.io/jboss-eap-7/eap74-openjdk8-openshift-rhel7"
-"jboss-eap-7/eap-xp2-openj9-11-openshift-rhel8" = "registry.redhat.io/jboss-eap-7/eap-xp2-openj9-11-openshift-rhel8"
-"jboss-eap-7/eap-xp2-openj9-11-runtime-openshift-rhel8" = "registry.redhat.io/jboss-eap-7/eap-xp2-openj9-11-runtime-openshift-rhel8"
-"jboss-eap-7/eap-xp2-openjdk11-openshift-rhel8" = "registry.redhat.io/jboss-eap-7/eap-xp2-openjdk11-openshift-rhel8"
-"jboss-eap-7/eap-xp2-openjdk11-runtime-openshift-rhel8" = "registry.redhat.io/jboss-eap-7/eap-xp2-openjdk11-runtime-openshift-rhel8"
-"jboss-eap-7/eap-xp2-openjdk8-openshift-rhel7" = "registry.redhat.io/jboss-eap-7/eap-xp2-openjdk8-openshift-rhel7"
-"jboss-eap-7/eap-xp2-openjdk8-runtime-openshift-rhel7" = "registry.redhat.io/jboss-eap-7/eap-xp2-openjdk8-runtime-openshift-rhel7"
-"jboss-eap-7/eap-xp3-openj9-11-openshift-rhel8" = "registry.redhat.io/jboss-eap-7/eap-xp3-openj9-11-openshift-rhel8"
+"jboss-eap-7/eap74-openjdk8-runtime-openshift-rhel7" = "registry.redhat.io/jboss-eap-7/eap74-openjdk8-runtime-openshift-rhel7"
 "jboss-fuse-6/fis-java-openshift" = "registry.access.redhat.com/jboss-fuse-6/fis-java-openshift"
 "jboss-fuse-6/fis-karaf-openshift" = "registry.access.redhat.com/jboss-fuse-6/fis-karaf-openshift"
+"jboss-webserver-5/webserver-openjdk8-operator-bundle" = "registry.redhat.io/jboss-webserver-5/webserver-openjdk8-operator-bundle"
+"jboss-webserver-5/webserver-openjdk8-rhel8-operator" = "registry.redhat.io/jboss-webserver-5/webserver-openjdk8-rhel8-operator"
 "jboss-webserver-5/webserver55-openj9-11-tomcat9-openshift-rhel8" = "registry.redhat.io/jboss-webserver-5/webserver55-openj9-11-tomcat9-openshift-rhel8"
 "jboss-webserver-5/webserver55-openjdk11-tomcat9-openshift-rhel8" = "registry.redhat.io/jboss-webserver-5/webserver55-openjdk11-tomcat9-openshift-rhel8"
 "jboss-webserver-5/webserver55-openjdk8-tomcat9-openshift-rhel8" = "registry.redhat.io/jboss-webserver-5/webserver55-openjdk8-tomcat9-openshift-rhel8"
-"jboss-webserver-5/webserver-openjdk8-operator-bundle" = "registry.redhat.io/jboss-webserver-5/webserver-openjdk8-operator-bundle"
-"jboss-webserver-5/webserver-openjdk8-rhel8-operator" = "registry.redhat.io/jboss-webserver-5/webserver-openjdk8-rhel8-operator"
 "jetstack/cert-manager-operator-bundle" = "registry.connect.redhat.com/jetstack/cert-manager-operator-bundle"
 "joget/joget-dx7-eap7" = "registry.connect.redhat.com/joget/joget-dx7-eap7"
 "joget/v6013" = "registry.connect.redhat.com/joget/v6013"
 "kong/kong-operator1" = "registry.connect.redhat.com/kong/kong-operator1"
+"linbit/linstor" = "registry.redhat.io/linbit/linstor"
 "linbit/linstor-client" = "registry.redhat.io/linbit/linstor-client"
-"linbit/linstor-controller2" = "registry.connect.redhat.com/linbit/linstor-controller2"
 "linbit/linstor-controller" = "registry.redhat.io/linbit/linstor-controller"
+"linbit/linstor-controller2" = "registry.connect.redhat.com/linbit/linstor-controller2"
 "linbit/linstor-csi" = "registry.connect.redhat.com/linbit/linstor-csi"
-"linbit/linstor" = "registry.redhat.io/linbit/linstor"
 "migration-toolkit-virtualization/mtv-controller-rhel8" = "registry.redhat.io/migration-toolkit-virtualization/mtv-controller-rhel8"
 "migration-toolkit-virtualization/mtv-must-gather-rhel8" = "registry.access.redhat.com/migration-toolkit-virtualization/mtv-must-gather-rhel8"
 "migration-toolkit-virtualization/mtv-operator-bundle" = "registry.redhat.io/migration-toolkit-virtualization/mtv-operator-bundle"
 "migration-toolkit-virtualization/mtv-rhel8-operator" = "registry.access.redhat.com/migration-toolkit-virtualization/mtv-rhel8-operator"
 "migration-toolkit-virtualization/mtv-ui-rhel8" = "registry.access.redhat.com/migration-toolkit-virtualization/mtv-ui-rhel8"
 "migration-toolkit-virtualization/mtv-validation-rhel8" = "registry.access.redhat.com/migration-toolkit-virtualization/mtv-validation-rhel8"
-"minio/minio-operator1" = "registry.redhat.io/minio/minio-operator1"
 "minio/minio-operator" = "registry.redhat.io/minio/minio-operator"
+"minio/minio-operator1" = "registry.connect.redhat.com/minio/minio-operator1"
 "mongodb/init-appdb" = "registry.connect.redhat.com/mongodb/init-appdb"
 "navops-command/web-ui-v13" = "registry.connect.redhat.com/navops-command/web-ui-v13"
 "ncipher/nshieldcontaineroptionpackv1" = "registry.connect.redhat.com/ncipher/nshieldcontaineroptionpackv1"
@@ -441,9 +449,9 @@
 "nuagenetworks/rhosp16-openstack-nova-compute-20-10-3" = "registry.connect.redhat.com/nuagenetworks/rhosp16-openstack-nova-compute-20-10-3"
 "nuodb/nuodb-ce" = "registry.connect.redhat.com/nuodb/nuodb-ce"
 "nuodb/nuodb-operator-bundle" = "registry.connect.redhat.com/nuodb/nuodb-operator-bundle"
-"ocp-tools-45/odo-init-container-rhel8" = "registry.redhat.io/ocp-tools-45/odo-init-container-rhel8"
 "ocp-tools-4/jenkins-rhel8" = "registry.redhat.io/ocp-tools-4/jenkins-rhel8"
 "ocp-tools-4/odo-init-container-rhel8" = "registry.access.redhat.com/ocp-tools-4/odo-init-container-rhel8"
+"ocp-tools-45/odo-init-container-rhel8" = "registry.redhat.io/ocp-tools-45/odo-init-container-rhel8"
 "ocs4/cephcsi-rhel8" = "registry.redhat.io/ocs4/cephcsi-rhel8"
 "ocs4/mcg-core-rhel8" = "registry.redhat.io/ocs4/mcg-core-rhel8"
 "ocs4/mcg-rhel8-operator" = "registry.redhat.io/ocs4/mcg-rhel8-operator"
@@ -453,22 +461,23 @@
 "ocs4/ocs-rhel8-operator" = "registry.redhat.io/ocs4/ocs-rhel8-operator"
 "ocs4/rook-ceph-rhel8-operator" = "registry.redhat.io/ocs4/rook-ceph-rhel8-operator"
 "ocs4/volume-replication-rhel8-operator" = "registry.redhat.io/ocs4/volume-replication-rhel8-operator"
+"opencloudio" = "quay.io/opencloudio"
 "opencloudio/alertmanager" = "quay.io/opencloudio/alertmanager"
 "opencloudio/audit-garbage-collector" = "quay.io/opencloudio/audit-garbage-collector"
 "opencloudio/audit-policy-controller" = "registry.redhat.io/opencloudio/audit-policy-controller"
 "opencloudio/audit-syslog-service" = "quay.io/opencloudio/audit-syslog-service"
 "opencloudio/collectd-exporter" = "quay.io/opencloudio/collectd-exporter"
+"opencloudio/common-service-operator" = "quay.io/opencloudio/common-service-operator"
 "opencloudio/common-service-operator-amd64" = "quay.io/opencloudio/common-service-operator-amd64"
 "opencloudio/common-service-operator-ppc64le" = "quay.io/opencloudio/common-service-operator-ppc64le"
-"opencloudio/common-service-operator" = "quay.io/opencloudio/common-service-operator"
 "opencloudio/common-web-ui" = "quay.io/opencloudio/common-web-ui"
 "opencloudio/configmap-reload" = "quay.io/opencloudio/configmap-reload"
-"opencloudio/curl-ppc64le" = "quay.io/opencloudio/curl-ppc64le"
 "opencloudio/curl" = "registry.redhat.io/opencloudio/curl"
+"opencloudio/curl-ppc64le" = "quay.io/opencloudio/curl-ppc64le"
 "opencloudio/dashboard-controller" = "quay.io/opencloudio/dashboard-controller"
 "opencloudio/fluentd" = "quay.io/opencloudio/fluentd"
-"opencloudio/grafana-ocpthanos-proxy" = "quay.io/opencloudio/grafana-ocpthanos-proxy"
 "opencloudio/grafana" = "quay.io/opencloudio/grafana"
+"opencloudio/grafana-ocpthanos-proxy" = "quay.io/opencloudio/grafana-ocpthanos-proxy"
 "opencloudio/iam-policy-administration" = "quay.io/opencloudio/iam-policy-administration"
 "opencloudio/iam-policy-controller" = "quay.io/opencloudio/iam-policy-controller"
 "opencloudio/iam-policy-decision" = "quay.io/opencloudio/iam-policy-decision"
@@ -477,9 +486,9 @@
 "opencloudio/ibm-cert-manager-operator" = "quay.io/opencloudio/ibm-cert-manager-operator"
 "opencloudio/ibm-commonui-operator" = "registry.redhat.io/opencloudio/ibm-commonui-operator"
 "opencloudio/ibm-cs-upgrade-to3.4" = "quay.io/opencloudio/ibm-cs-upgrade-to3.4"
+"opencloudio/ibm-cs-webhook" = "quay.io/opencloudio/ibm-cs-webhook"
 "opencloudio/ibm-cs-webhook-amd64" = "quay.io/opencloudio/ibm-cs-webhook-amd64"
 "opencloudio/ibm-cs-webhook-ppc64le" = "quay.io/opencloudio/ibm-cs-webhook-ppc64le"
-"opencloudio/ibm-cs-webhook" = "quay.io/opencloudio/ibm-cs-webhook"
 "opencloudio/ibm-dashboard-data-collector" = "registry.redhat.io/opencloudio/ibm-dashboard-data-collector"
 "opencloudio/ibm-elastic-stack-operator" = "quay.io/opencloudio/ibm-elastic-stack-operator"
 "opencloudio/ibm-events-kafka-2.6.0" = "quay.io/opencloudio/ibm-events-kafka-2.6.0"
@@ -489,93 +498,92 @@
 "opencloudio/ibm-helm-repo-operator" = "quay.io/opencloudio/ibm-helm-repo-operator"
 "opencloudio/ibm-iam-operator" = "registry.redhat.io/opencloudio/ibm-iam-operator"
 "opencloudio/ibm-ingress-nginx-operator" = "quay.io/opencloudio/ibm-ingress-nginx-operator"
-"opencloudio/ibm-licensing-operator" = "quay.io/opencloudio/ibm-licensing-operator"
 "opencloudio/ibm-licensing" = "registry.redhat.io/opencloudio/ibm-licensing"
+"opencloudio/ibm-licensing-operator" = "quay.io/opencloudio/ibm-licensing-operator"
 "opencloudio/ibm-management-ingress-operator" = "quay.io/opencloudio/ibm-management-ingress-operator"
 "opencloudio/ibm-metering-operator" = "quay.io/opencloudio/ibm-metering-operator"
-"opencloudio/ibm-mongodb-exporter-ppc64le" = "quay.io/opencloudio/ibm-mongodb-exporter-ppc64le"
+"opencloudio/ibm-mongodb" = "quay.io/opencloudio/ibm-mongodb"
 "opencloudio/ibm-mongodb-exporter" = "quay.io/opencloudio/ibm-mongodb-exporter"
-"opencloudio/ibm-mongodb-install-ppc64le" = "quay.io/opencloudio/ibm-mongodb-install-ppc64le"
+"opencloudio/ibm-mongodb-exporter-ppc64le" = "quay.io/opencloudio/ibm-mongodb-exporter-ppc64le"
 "opencloudio/ibm-mongodb-install" = "quay.io/opencloudio/ibm-mongodb-install"
+"opencloudio/ibm-mongodb-install-ppc64le" = "quay.io/opencloudio/ibm-mongodb-install-ppc64le"
 "opencloudio/ibm-mongodb-operator" = "quay.io/opencloudio/ibm-mongodb-operator"
 "opencloudio/ibm-mongodb-ppc64le" = "quay.io/opencloudio/ibm-mongodb-ppc64le"
-"opencloudio/ibm-mongodb" = "quay.io/opencloudio/ibm-mongodb"
 "opencloudio/ibm-monitoring-exporters-operator" = "quay.io/opencloudio/ibm-monitoring-exporters-operator"
 "opencloudio/ibm-monitoring-grafana-operator" = "registry.redhat.io/opencloudio/ibm-monitoring-grafana-operator"
 "opencloudio/ibm-monitoring-prometheusext-operator" = "registry.redhat.io/opencloudio/ibm-monitoring-prometheusext-operator"
 "opencloudio/ibm-namespace-scope-operator" = "registry.redhat.io/opencloudio/ibm-namespace-scope-operator"
 "opencloudio/ibm-platform-api-operator" = "quay.io/opencloudio/ibm-platform-api-operator"
+"opencloudio/ibm-secretshare-operator" = "quay.io/opencloudio/ibm-secretshare-operator"
 "opencloudio/ibm-secretshare-operator-amd64" = "quay.io/opencloudio/ibm-secretshare-operator-amd64"
 "opencloudio/ibm-secretshare-operator-ppc64le" = "quay.io/opencloudio/ibm-secretshare-operator-ppc64le"
-"opencloudio/ibm-secretshare-operator" = "quay.io/opencloudio/ibm-secretshare-operator"
 "opencloudio/icp-audit-service" = "quay.io/opencloudio/icp-audit-service"
-"opencloudio/icp-catalog-ui-ppc64le" = "quay.io/opencloudio/icp-catalog-ui-ppc64le"
 "opencloudio/icp-catalog-ui" = "quay.io/opencloudio/icp-catalog-ui"
-"opencloudio/icp-cert-manager-acmesolver-ppc64le" = "quay.io/opencloudio/icp-cert-manager-acmesolver-ppc64le"
+"opencloudio/icp-catalog-ui-ppc64le" = "quay.io/opencloudio/icp-catalog-ui-ppc64le"
 "opencloudio/icp-cert-manager-acmesolver" = "quay.io/opencloudio/icp-cert-manager-acmesolver"
-"opencloudio/icp-cert-manager-cainjector-ppc64le" = "quay.io/opencloudio/icp-cert-manager-cainjector-ppc64le"
+"opencloudio/icp-cert-manager-acmesolver-ppc64le" = "quay.io/opencloudio/icp-cert-manager-acmesolver-ppc64le"
 "opencloudio/icp-cert-manager-cainjector" = "quay.io/opencloudio/icp-cert-manager-cainjector"
-"opencloudio/icp-cert-manager-controller-ppc64le" = "quay.io/opencloudio/icp-cert-manager-controller-ppc64le"
+"opencloudio/icp-cert-manager-cainjector-ppc64le" = "quay.io/opencloudio/icp-cert-manager-cainjector-ppc64le"
 "opencloudio/icp-cert-manager-controller" = "registry.redhat.io/opencloudio/icp-cert-manager-controller"
-"opencloudio/icp-cert-manager-webhook-ppc64le" = "quay.io/opencloudio/icp-cert-manager-webhook-ppc64le"
+"opencloudio/icp-cert-manager-controller-ppc64le" = "quay.io/opencloudio/icp-cert-manager-controller-ppc64le"
 "opencloudio/icp-cert-manager-webhook" = "quay.io/opencloudio/icp-cert-manager-webhook"
-"opencloudio/icp-configmap-watcher-ppc64le" = "quay.io/opencloudio/icp-configmap-watcher-ppc64le"
+"opencloudio/icp-cert-manager-webhook-ppc64le" = "quay.io/opencloudio/icp-cert-manager-webhook-ppc64le"
 "opencloudio/icp-configmap-watcher" = "quay.io/opencloudio/icp-configmap-watcher"
-"opencloudio/icp-elasticsearch-oss-ppc64le" = "quay.io/opencloudio/icp-elasticsearch-oss-ppc64le"
+"opencloudio/icp-configmap-watcher-ppc64le" = "quay.io/opencloudio/icp-configmap-watcher-ppc64le"
 "opencloudio/icp-elasticsearch-oss" = "quay.io/opencloudio/icp-elasticsearch-oss"
-"opencloudio/icp-filebeat-oss-ppc64le" = "quay.io/opencloudio/icp-filebeat-oss-ppc64le"
+"opencloudio/icp-elasticsearch-oss-ppc64le" = "quay.io/opencloudio/icp-elasticsearch-oss-ppc64le"
 "opencloudio/icp-filebeat-oss" = "quay.io/opencloudio/icp-filebeat-oss"
-"opencloudio/icp-helm-api-ppc64le" = "quay.io/opencloudio/icp-helm-api-ppc64le"
+"opencloudio/icp-filebeat-oss-ppc64le" = "quay.io/opencloudio/icp-filebeat-oss-ppc64le"
 "opencloudio/icp-helm-api" = "quay.io/opencloudio/icp-helm-api"
-"opencloudio/icp-helm-repo-ppc64le" = "quay.io/opencloudio/icp-helm-repo-ppc64le"
+"opencloudio/icp-helm-api-ppc64le" = "quay.io/opencloudio/icp-helm-api-ppc64le"
 "opencloudio/icp-helm-repo" = "quay.io/opencloudio/icp-helm-repo"
-"opencloudio/icp-helm-rudder-ppc64le" = "quay.io/opencloudio/icp-helm-rudder-ppc64le"
+"opencloudio/icp-helm-repo-ppc64le" = "quay.io/opencloudio/icp-helm-repo-ppc64le"
 "opencloudio/icp-helm-rudder" = "quay.io/opencloudio/icp-helm-rudder"
+"opencloudio/icp-helm-rudder-ppc64le" = "quay.io/opencloudio/icp-helm-rudder-ppc64le"
 "opencloudio/icp-iam-onboarding" = "quay.io/opencloudio/icp-iam-onboarding"
 "opencloudio/icp-identity-manager" = "quay.io/opencloudio/icp-identity-manager"
 "opencloudio/icp-identity-provider" = "quay.io/opencloudio/icp-identity-provider"
-"opencloudio/icp-initcontainer-ppc64le" = "quay.io/opencloudio/icp-initcontainer-ppc64le"
 "opencloudio/icp-initcontainer" = "quay.io/opencloudio/icp-initcontainer"
-"opencloudio/icp-kibana-oss-ppc64le" = "quay.io/opencloudio/icp-kibana-oss-ppc64le"
+"opencloudio/icp-initcontainer-ppc64le" = "quay.io/opencloudio/icp-initcontainer-ppc64le"
 "opencloudio/icp-kibana-oss" = "quay.io/opencloudio/icp-kibana-oss"
-"opencloudio/icp-logstash-oss-ppc64le" = "quay.io/opencloudio/icp-logstash-oss-ppc64le"
+"opencloudio/icp-kibana-oss-ppc64le" = "quay.io/opencloudio/icp-kibana-oss-ppc64le"
 "opencloudio/icp-logstash-oss" = "quay.io/opencloudio/icp-logstash-oss"
+"opencloudio/icp-logstash-oss-ppc64le" = "quay.io/opencloudio/icp-logstash-oss-ppc64le"
 "opencloudio/icp-management-ingress" = "quay.io/opencloudio/icp-management-ingress"
-"opencloudio/icp-memcached-ppc64le" = "quay.io/opencloudio/icp-memcached-ppc64le"
 "opencloudio/icp-memcached" = "quay.io/opencloudio/icp-memcached"
+"opencloudio/icp-memcached-ppc64le" = "quay.io/opencloudio/icp-memcached-ppc64le"
 "opencloudio/icp-oidcclient-watcher" = "quay.io/opencloudio/icp-oidcclient-watcher"
-"opencloudio/icp-platform-api-ppc64le" = "quay.io/opencloudio/icp-platform-api-ppc64le"
 "opencloudio/icp-platform-api" = "quay.io/opencloudio/icp-platform-api"
+"opencloudio/icp-platform-api-ppc64le" = "quay.io/opencloudio/icp-platform-api-ppc64le"
 "opencloudio/icp-platform-auth" = "quay.io/opencloudio/icp-platform-auth"
 "opencloudio/icp-secret-watcher" = "quay.io/opencloudio/icp-secret-watcher"
-"opencloudio/indices-cleaner-ppc64le" = "quay.io/opencloudio/indices-cleaner-ppc64le"
 "opencloudio/indices-cleaner" = "quay.io/opencloudio/indices-cleaner"
+"opencloudio/indices-cleaner-ppc64le" = "quay.io/opencloudio/indices-cleaner-ppc64le"
 "opencloudio/kube-state-metrics" = "quay.io/opencloudio/kube-state-metrics"
-"opencloudio/logging-pki-init-ppc64le" = "quay.io/opencloudio/logging-pki-init-ppc64le"
 "opencloudio/logging-pki-init" = "quay.io/opencloudio/logging-pki-init"
-"opencloudio/metering-data-manager-ppc64le" = "quay.io/opencloudio/metering-data-manager-ppc64le"
+"opencloudio/logging-pki-init-ppc64le" = "quay.io/opencloudio/logging-pki-init-ppc64le"
 "opencloudio/metering-data-manager" = "quay.io/opencloudio/metering-data-manager"
-"opencloudio/metering-mcmui-ppc64le" = "quay.io/opencloudio/metering-mcmui-ppc64le"
+"opencloudio/metering-data-manager-ppc64le" = "quay.io/opencloudio/metering-data-manager-ppc64le"
 "opencloudio/metering-mcmui" = "quay.io/opencloudio/metering-mcmui"
-"opencloudio/metering-report-ppc64le" = "quay.io/opencloudio/metering-report-ppc64le"
+"opencloudio/metering-mcmui-ppc64le" = "quay.io/opencloudio/metering-mcmui-ppc64le"
 "opencloudio/metering-report" = "quay.io/opencloudio/metering-report"
-"opencloudio/metering-ui-ppc64le" = "quay.io/opencloudio/metering-ui-ppc64le"
+"opencloudio/metering-report-ppc64le" = "quay.io/opencloudio/metering-report-ppc64le"
 "opencloudio/metering-ui" = "quay.io/opencloudio/metering-ui"
+"opencloudio/metering-ui-ppc64le" = "quay.io/opencloudio/metering-ui-ppc64le"
 "opencloudio/must-gather" = "quay.io/opencloudio/must-gather"
 "opencloudio/must-gather-service" = "quay.io/opencloudio/must-gather-service"
 "opencloudio/node-exporter" = "quay.io/opencloudio/node-exporter"
+"opencloudio/odlm" = "registry.redhat.io/opencloudio/odlm"
 "opencloudio/odlm-amd64" = "quay.io/opencloudio/odlm-amd64"
 "opencloudio/odlm-ppc64le" = "quay.io/opencloudio/odlm-ppc64le"
-"opencloudio/odlm" = "registry.redhat.io/opencloudio/odlm"
+"opencloudio/prometheus" = "quay.io/opencloudio/prometheus"
 "opencloudio/prometheus-config-reloader" = "quay.io/opencloudio/prometheus-config-reloader"
 "opencloudio/prometheus-controller" = "quay.io/opencloudio/prometheus-controller"
 "opencloudio/prometheus-exporter" = "quay.io/opencloudio/prometheus-exporter"
-"opencloudio/prometheus" = "quay.io/opencloudio/prometheus"
-"opencloudio" = "quay.io/opencloudio"
-"opencloudio/system-healthcheck-service-ppc64le" = "quay.io/opencloudio/system-healthcheck-service-ppc64le"
 "opencloudio/system-healthcheck-service" = "quay.io/opencloudio/system-healthcheck-service"
-"opencloudio/tiller-ppc64le" = "quay.io/opencloudio/tiller-ppc64le"
+"opencloudio/system-healthcheck-service-ppc64le" = "quay.io/opencloudio/system-healthcheck-service-ppc64le"
 "opencloudio/tiller" = "quay.io/opencloudio/tiller"
+"opencloudio/tiller-ppc64le" = "quay.io/opencloudio/tiller-ppc64le"
 "openj9/openj9-11-rhel7" = "registry.redhat.io/openj9/openj9-11-rhel7"
 "openj9/openj9-11-rhel8" = "registry.redhat.io/openj9/openj9-11-rhel8"
 "openj9/openj9-8-rhel7" = "registry.redhat.io/openj9/openj9-8-rhel7"
@@ -583,84 +591,185 @@
 "openjdk/openjdk-11-rhel7" = "registry.access.redhat.com/openjdk/openjdk-11-rhel7"
 "openlegacy-corp/nocode" = "registry.redhat.io/openlegacy-corp/nocode"
 "openmake-software/deployhub-pro" = "registry.connect.redhat.com/openmake-software/deployhub-pro"
-"openshift3/apb-base" = "registry.redhat.io/openshift3/apb-base"
-"openshift3/apb-tools" = "registry.access.redhat.com/openshift3/apb-tools"
-"openshift3/automation-broker-apb" = "registry.access.redhat.com/openshift3/automation-broker-apb"
-"openshift3/grafana" = "registry.access.redhat.com/openshift3/grafana"
-"openshift3/image-inspector" = "registry.access.redhat.com/openshift3/image-inspector"
-"openshift3/jenkins-2-rhel7" = "registry.access.redhat.com/openshift3/jenkins-2-rhel7"
-"openshift3/jenkins-agent-maven-35-rhel7" = "registry.access.redhat.com/openshift3/jenkins-agent-maven-35-rhel7"
-"openshift3/jenkins-agent-maven-36-rhel7" = "registry.redhat.io/openshift3/jenkins-agent-maven-36-rhel7"
-"openshift3/jenkins-agent-nodejs-12-rhel7" = "registry.redhat.io/openshift3/jenkins-agent-nodejs-12-rhel7"
-"openshift3/jenkins-slave-base-rhel7" = "registry.access.redhat.com/openshift3/jenkins-slave-base-rhel7"
-"openshift3/kuryr-cni" = "registry.redhat.io/openshift3/kuryr-cni"
-"openshift3/kuryr-controller" = "registry.access.redhat.com/openshift3/kuryr-controller"
-"openshift3/logging-elasticsearch5" = "registry.access.redhat.com/openshift3/logging-elasticsearch5"
-"openshift3/logging-elasticsearch" = "registry.access.redhat.com/openshift3/logging-elasticsearch"
-"openshift3/logging-fluentd" = "registry.access.redhat.com/openshift3/logging-fluentd"
-"openshift3/mariadb-apb" = "registry.access.redhat.com/openshift3/mariadb-apb"
-"openshift3/mediawiki-apb" = "registry.access.redhat.com/openshift3/mediawiki-apb"
-"openshift3/mediawiki" = "registry.access.redhat.com/openshift3/mediawiki"
-"openshift3/metrics-cassandra" = "registry.access.redhat.com/openshift3/metrics-cassandra"
-"openshift3/metrics-hawkular-metrics" = "registry.access.redhat.com/openshift3/metrics-hawkular-metrics"
-"openshift3/metrics-heapster" = "registry.access.redhat.com/openshift3/metrics-heapster"
-"openshift3/mysql-apb" = "registry.access.redhat.com/openshift3/mysql-apb"
-"openshift3/node" = "registry.access.redhat.com/openshift3/node"
-"openshift3/oauth-proxy" = "registry.access.redhat.com/openshift3/oauth-proxy"
-"openshift3/openshift-ansible-installer" = "registry.access.redhat.com/openshift3/openshift-ansible-installer"
-"openshift3/ose-ansible" = "registry.access.redhat.com/openshift3/ose-ansible"
-"openshift3/ose-ansible-service-broker" = "registry.access.redhat.com/openshift3/ose-ansible-service-broker"
-"openshift3/ose-autoheal" = "registry.access.redhat.com/openshift3/ose-autoheal"
-"openshift3/ose-cli" = "registry.access.redhat.com/openshift3/ose-cli"
-"openshift3/ose-cluster-autoscaler" = "registry.access.redhat.com/openshift3/ose-cluster-autoscaler"
-"openshift3/ose-cluster-capacity" = "registry.access.redhat.com/openshift3/ose-cluster-capacity"
-"openshift3/ose-cluster-monitoring-operator" = "registry.access.redhat.com/openshift3/ose-cluster-monitoring-operator"
-"openshift3/ose-configmap-reloader" = "registry.access.redhat.com/openshift3/ose-configmap-reloader"
-"openshift3/ose-console" = "registry.access.redhat.com/openshift3/ose-console"
-"openshift3/ose-control-plane" = "registry.access.redhat.com/openshift3/ose-control-plane"
-"openshift3/ose-deployer" = "registry.access.redhat.com/openshift3/ose-deployer"
-"openshift3/ose-docker-builder" = "registry.access.redhat.com/openshift3/ose-docker-builder"
-"openshift3/ose-docker-registry" = "registry.access.redhat.com/openshift3/ose-docker-registry"
-"openshift3/ose-egress-dns-proxy" = "registry.access.redhat.com/openshift3/ose-egress-dns-proxy"
-"openshift3/ose-egress-http-proxy" = "registry.access.redhat.com/openshift3/ose-egress-http-proxy"
-"openshift3/ose-egress-router" = "registry.access.redhat.com/openshift3/ose-egress-router"
-"openshift3/ose-federation" = "registry.access.redhat.com/openshift3/ose-federation"
-"openshift3/ose-haproxy-router" = "registry.access.redhat.com/openshift3/ose-haproxy-router"
-"openshift3/ose-hyperkube" = "registry.access.redhat.com/openshift3/ose-hyperkube"
-"openshift3/ose-hypershift" = "registry.access.redhat.com/openshift3/ose-hypershift"
-"openshift3/ose-keepalived-ipfailover" = "registry.access.redhat.com/openshift3/ose-keepalived-ipfailover"
-"openshift3/ose-kube-rbac-proxy" = "registry.access.redhat.com/openshift3/ose-kube-rbac-proxy"
-"openshift3/ose-kube-state-metrics" = "registry.access.redhat.com/openshift3/ose-kube-state-metrics"
-"openshift3/ose-kuryr-cni" = "registry.redhat.io/openshift3/ose-kuryr-cni"
-"openshift3/ose-kuryr-controller" = "registry.redhat.io/openshift3/ose-kuryr-controller"
-"openshift3/ose-logging-curator5" = "registry.access.redhat.com/openshift3/ose-logging-curator5"
-"openshift3/ose-logging-elasticsearch5" = "registry.access.redhat.com/openshift3/ose-logging-elasticsearch5"
-"openshift3/ose-logging-elasticsearch" = "registry.access.redhat.com/openshift3/ose-logging-elasticsearch"
-"openshift3/ose-logging-eventrouter" = "registry.access.redhat.com/openshift3/ose-logging-eventrouter"
-"openshift3/ose-logging-fluentd" = "registry.access.redhat.com/openshift3/ose-logging-fluentd"
-"openshift3/ose-logging-kibana5" = "registry.access.redhat.com/openshift3/ose-logging-kibana5"
-"openshift3/ose-metrics-cassandra" = "registry.access.redhat.com/openshift3/ose-metrics-cassandra"
-"openshift3/ose-metrics-hawkular-metrics" = "registry.access.redhat.com/openshift3/ose-metrics-hawkular-metrics"
-"openshift3/ose-metrics-heapster" = "registry.access.redhat.com/openshift3/ose-metrics-heapster"
-"openshift3/ose-metrics-schema-installer" = "registry.access.redhat.com/openshift3/ose-metrics-schema-installer"
-"openshift3/ose-metrics-server" = "registry.access.redhat.com/openshift3/ose-metrics-server"
-"openshift3/ose-node" = "registry.access.redhat.com/openshift3/ose-node"
-"openshift3/ose-operator-lifecycle-manager" = "registry.access.redhat.com/openshift3/ose-operator-lifecycle-manager"
-"openshift3/ose-pod" = "registry.access.redhat.com/openshift3/ose-pod"
-"openshift3/ose-prometheus-config-reloader" = "registry.access.redhat.com/openshift3/ose-prometheus-config-reloader"
-"openshift3/ose-recycler" = "registry.access.redhat.com/openshift3/ose-recycler"
-"openshift3/ose" = "registry.access.redhat.com/openshift3/ose"
-"openshift3/ose-service-catalog" = "registry.access.redhat.com/openshift3/ose-service-catalog"
-"openshift3/ose-service-serving-cert-signer" = "registry.access.redhat.com/openshift3/ose-service-serving-cert-signer"
-"openshift3/ose-template-service-broker" = "registry.access.redhat.com/openshift3/ose-template-service-broker"
-"openshift3/ose-tests" = "registry.access.redhat.com/openshift3/ose-tests"
-"openshift3/ose-web-console" = "registry.access.redhat.com/openshift3/ose-web-console"
-"openshift3/postgresql-apb" = "registry.access.redhat.com/openshift3/postgresql-apb"
+"openshift-gitops-1/applicationset-rhel8" = "registry.redhat.io/openshift-gitops-1/applicationset-rhel8"
+"openshift-gitops-1/argocd-rhel8" = "registry.redhat.io/openshift-gitops-1/argocd-rhel8"
+"openshift-gitops-1/gitops-operator-bundle" = "registry.redhat.io/openshift-gitops-1/gitops-operator-bundle"
+"openshift-gitops-1/gitops-rhel8" = "registry.redhat.io/openshift-gitops-1/gitops-rhel8"
+"openshift-gitops-1/gitops-rhel8-operator" = "registry.redhat.io/openshift-gitops-1/gitops-rhel8-operator"
+"openshift-gitops-1/kam-delivery-rhel8" = "registry.redhat.io/openshift-gitops-1/kam-delivery-rhel8"
+"openshift-istio/kiali-operator-metadata" = "registry.redhat.io/openshift-istio/kiali-operator-metadata"
+"openshift-logging/cluster-logging-operator-bundle" = "registry.redhat.io/openshift-logging/cluster-logging-operator-bundle"
+"openshift-logging/cluster-logging-rhel8-operator" = "registry.redhat.io/openshift-logging/cluster-logging-rhel8-operator"
+"openshift-logging/elasticsearch-operator-bundle" = "registry.redhat.io/openshift-logging/elasticsearch-operator-bundle"
+"openshift-logging/elasticsearch-proxy-rhel8" = "registry.redhat.io/openshift-logging/elasticsearch-proxy-rhel8"
+"openshift-logging/elasticsearch-rhel8-operator" = "registry.redhat.io/openshift-logging/elasticsearch-rhel8-operator"
+"openshift-logging/elasticsearch6-rhel8" = "registry.redhat.io/openshift-logging/elasticsearch6-rhel8"
+"openshift-logging/eventrouter-rhel8" = "registry.redhat.io/openshift-logging/eventrouter-rhel8"
+"openshift-logging/fluentd-rhel8" = "registry.redhat.io/openshift-logging/fluentd-rhel8"
+"openshift-logging/kibana6-rhel8" = "registry.redhat.io/openshift-logging/kibana6-rhel8"
+"openshift-logging/logging-curator5-rhel8" = "registry.redhat.io/openshift-logging/logging-curator5-rhel8"
+"openshift-metering/ose-metering-ghostunnel-rhel8" = "registry.redhat.io/openshift-metering/ose-metering-ghostunnel-rhel8"
+"openshift-metering/ose-metering-hadoop-rhel8" = "registry.redhat.io/openshift-metering/ose-metering-hadoop-rhel8"
+"openshift-pipelines/pipelines-cli-tkn-rhel8" = "registry.redhat.io/openshift-pipelines/pipelines-cli-tkn-rhel8"
+"openshift-pipelines/pipelines-controller-rhel8" = "registry.redhat.io/openshift-pipelines/pipelines-controller-rhel8"
+"openshift-pipelines/pipelines-entrypoint-rhel8" = "registry.redhat.io/openshift-pipelines/pipelines-entrypoint-rhel8"
+"openshift-pipelines/pipelines-git-init-rhel8" = "registry.redhat.io/openshift-pipelines/pipelines-git-init-rhel8"
+"openshift-pipelines/pipelines-imagedigestexporter-rhel8" = "registry.redhat.io/openshift-pipelines/pipelines-imagedigestexporter-rhel8"
+"openshift-pipelines/pipelines-kubeconfigwriter-rhel8" = "registry.redhat.io/openshift-pipelines/pipelines-kubeconfigwriter-rhel8"
+"openshift-pipelines/pipelines-nop-rhel8" = "registry.redhat.io/openshift-pipelines/pipelines-nop-rhel8"
+"openshift-pipelines/pipelines-operator-bundle" = "registry.redhat.io/openshift-pipelines/pipelines-operator-bundle"
+"openshift-pipelines/pipelines-operator-proxy-rhel8" = "registry.redhat.io/openshift-pipelines/pipelines-operator-proxy-rhel8"
+"openshift-pipelines/pipelines-pullrequest-init-rhel8" = "registry.redhat.io/openshift-pipelines/pipelines-pullrequest-init-rhel8"
+"openshift-pipelines/pipelines-rhel8-operator" = "registry.redhat.io/openshift-pipelines/pipelines-rhel8-operator"
+"openshift-pipelines/pipelines-triggers-controller-rhel8" = "registry.redhat.io/openshift-pipelines/pipelines-triggers-controller-rhel8"
+"openshift-pipelines/pipelines-triggers-core-interceptors-rhel8" = "registry.redhat.io/openshift-pipelines/pipelines-triggers-core-interceptors-rhel8"
+"openshift-pipelines/pipelines-triggers-eventlistenersink-rhel8" = "registry.redhat.io/openshift-pipelines/pipelines-triggers-eventlistenersink-rhel8"
+"openshift-pipelines/pipelines-triggers-webhook-rhel8" = "registry.redhat.io/openshift-pipelines/pipelines-triggers-webhook-rhel8"
+"openshift-pipelines/pipelines-webhook-rhel8" = "registry.redhat.io/openshift-pipelines/pipelines-webhook-rhel8"
+"openshift-serverless-1/client-kn-rhel8" = "registry.redhat.io/openshift-serverless-1/client-kn-rhel8"
+"openshift-serverless-1/eventing-apiserver-receive-adapter-rhel8" = "registry.redhat.io/openshift-serverless-1/eventing-apiserver-receive-adapter-rhel8"
+"openshift-serverless-1/eventing-controller-rhel8" = "registry.redhat.io/openshift-serverless-1/eventing-controller-rhel8"
+"openshift-serverless-1/eventing-in-memory-channel-controller-rhel8" = "registry.redhat.io/openshift-serverless-1/eventing-in-memory-channel-controller-rhel8"
+"openshift-serverless-1/eventing-in-memory-channel-dispatcher-rhel8" = "registry.redhat.io/openshift-serverless-1/eventing-in-memory-channel-dispatcher-rhel8"
+"openshift-serverless-1/eventing-kafka-channel-controller-rhel8" = "registry.redhat.io/openshift-serverless-1/eventing-kafka-channel-controller-rhel8"
+"openshift-serverless-1/eventing-kafka-channel-dispatcher-rhel8" = "registry.redhat.io/openshift-serverless-1/eventing-kafka-channel-dispatcher-rhel8"
+"openshift-serverless-1/eventing-kafka-channel-webhook-rhel8" = "registry.redhat.io/openshift-serverless-1/eventing-kafka-channel-webhook-rhel8"
+"openshift-serverless-1/eventing-kafka-source-controller-rhel8" = "registry.redhat.io/openshift-serverless-1/eventing-kafka-source-controller-rhel8"
+"openshift-serverless-1/eventing-kafka-source-receive-adapter-rhel8" = "registry.redhat.io/openshift-serverless-1/eventing-kafka-source-receive-adapter-rhel8"
+"openshift-serverless-1/eventing-kafka-storage-version-migration-rhel8" = "registry.redhat.io/openshift-serverless-1/eventing-kafka-storage-version-migration-rhel8"
+"openshift-serverless-1/eventing-mtbroker-filter-rhel8" = "registry.redhat.io/openshift-serverless-1/eventing-mtbroker-filter-rhel8"
+"openshift-serverless-1/eventing-mtbroker-ingress-rhel8" = "registry.redhat.io/openshift-serverless-1/eventing-mtbroker-ingress-rhel8"
+"openshift-serverless-1/eventing-mtchannel-broker-rhel8" = "registry.redhat.io/openshift-serverless-1/eventing-mtchannel-broker-rhel8"
+"openshift-serverless-1/eventing-mtping-rhel8" = "registry.redhat.io/openshift-serverless-1/eventing-mtping-rhel8"
+"openshift-serverless-1/eventing-ping-rhel8" = "registry.redhat.io/openshift-serverless-1/eventing-ping-rhel8"
+"openshift-serverless-1/eventing-ping-source-cleanup-rhel8" = "registry.redhat.io/openshift-serverless-1/eventing-ping-source-cleanup-rhel8"
+"openshift-serverless-1/eventing-storage-version-migration-rhel8" = "registry.redhat.io/openshift-serverless-1/eventing-storage-version-migration-rhel8"
+"openshift-serverless-1/eventing-sugar-controller-rhel8" = "registry.redhat.io/openshift-serverless-1/eventing-sugar-controller-rhel8"
+"openshift-serverless-1/eventing-webhook-rhel8" = "registry.redhat.io/openshift-serverless-1/eventing-webhook-rhel8"
+"openshift-serverless-1/ingress-rhel8-operator" = "registry.redhat.io/openshift-serverless-1/ingress-rhel8-operator"
+"openshift-serverless-1/kn-cli-artifacts-rhel8" = "registry.redhat.io/openshift-serverless-1/kn-cli-artifacts-rhel8"
+"openshift-serverless-1/knative-rhel8-operator" = "registry.redhat.io/openshift-serverless-1/knative-rhel8-operator"
+"openshift-serverless-1/knative-serving-rhel8-operator" = "registry.redhat.io/openshift-serverless-1/knative-serving-rhel8-operator"
+"openshift-serverless-1/kourier-control-rhel8" = "registry.redhat.io/openshift-serverless-1/kourier-control-rhel8"
+"openshift-serverless-1/net-istio-controller-rhel8" = "registry.redhat.io/openshift-serverless-1/net-istio-controller-rhel8"
+"openshift-serverless-1/net-istio-webhook-rhel8" = "registry.redhat.io/openshift-serverless-1/net-istio-webhook-rhel8"
+"openshift-serverless-1/serverless-operator-bundle" = "registry.redhat.io/openshift-serverless-1/serverless-operator-bundle"
+"openshift-serverless-1/serverless-rhel8-operator" = "registry.redhat.io/openshift-serverless-1/serverless-rhel8-operator"
+"openshift-serverless-1/serving-activator-rhel8" = "registry.redhat.io/openshift-serverless-1/serving-activator-rhel8"
+"openshift-serverless-1/serving-autoscaler-hpa-rhel8" = "registry.redhat.io/openshift-serverless-1/serving-autoscaler-hpa-rhel8"
+"openshift-serverless-1/serving-autoscaler-rhel8" = "registry.redhat.io/openshift-serverless-1/serving-autoscaler-rhel8"
+"openshift-serverless-1/serving-controller-rhel8" = "registry.redhat.io/openshift-serverless-1/serving-controller-rhel8"
+"openshift-serverless-1/serving-domain-mapper-rhel8" = "registry.redhat.io/openshift-serverless-1/serving-domain-mapper-rhel8"
+"openshift-serverless-1/serving-domain-mapping-rhel8" = "registry.redhat.io/openshift-serverless-1/serving-domain-mapping-rhel8"
+"openshift-serverless-1/serving-domain-mapping-webhook-rhel8" = "registry.redhat.io/openshift-serverless-1/serving-domain-mapping-webhook-rhel8"
+"openshift-serverless-1/serving-queue-rhel8" = "registry.redhat.io/openshift-serverless-1/serving-queue-rhel8"
+"openshift-serverless-1/serving-storage-version-migration-rhel8" = "registry.redhat.io/openshift-serverless-1/serving-storage-version-migration-rhel8"
+"openshift-serverless-1/serving-webhook-rhel8" = "registry.redhat.io/openshift-serverless-1/serving-webhook-rhel8"
+"openshift-serverless-1/svls-must-gather-rhel8" = "registry.redhat.io/openshift-serverless-1/svls-must-gather-rhel8"
+"openshift-service-mesh/3scale-istio-adapter-rhel8" = "registry.redhat.io/openshift-service-mesh/3scale-istio-adapter-rhel8"
+"openshift-service-mesh/citadel-rhel8" = "registry.redhat.io/openshift-service-mesh/citadel-rhel8"
+"openshift-service-mesh/galley-rhel8" = "registry.redhat.io/openshift-service-mesh/galley-rhel8"
+"openshift-service-mesh/grafana-rhel8" = "registry.redhat.io/openshift-service-mesh/grafana-rhel8"
+"openshift-service-mesh/ior-rhel8" = "registry.redhat.io/openshift-service-mesh/ior-rhel8"
+"openshift-service-mesh/istio-cni-rhel8" = "registry.redhat.io/openshift-service-mesh/istio-cni-rhel8"
+"openshift-service-mesh/istio-must-gather-rhel8" = "registry.redhat.io/openshift-service-mesh/istio-must-gather-rhel8"
+"openshift-service-mesh/istio-rhel8-operator" = "registry.redhat.io/openshift-service-mesh/istio-rhel8-operator"
+"openshift-service-mesh/kiali-rhel7" = "registry.redhat.io/openshift-service-mesh/kiali-rhel7"
+"openshift-service-mesh/kiali-rhel8" = "registry.redhat.io/openshift-service-mesh/kiali-rhel8"
+"openshift-service-mesh/kiali-rhel8-operator" = "registry.redhat.io/openshift-service-mesh/kiali-rhel8-operator"
+"openshift-service-mesh/mixer-rhel8" = "registry.redhat.io/openshift-service-mesh/mixer-rhel8"
+"openshift-service-mesh/pilot-rhel8" = "registry.redhat.io/openshift-service-mesh/pilot-rhel8"
+"openshift-service-mesh/prometheus-rhel8" = "registry.redhat.io/openshift-service-mesh/prometheus-rhel8"
+"openshift-service-mesh/proxy-init-rhel7" = "registry.redhat.io/openshift-service-mesh/proxy-init-rhel7"
+"openshift-service-mesh/proxy-init-rhel8" = "registry.redhat.io/openshift-service-mesh/proxy-init-rhel8"
+"openshift-service-mesh/proxyv2-rhel8" = "registry.redhat.io/openshift-service-mesh/proxyv2-rhel8"
+"openshift-service-mesh/sidecar-injector-rhel8" = "registry.redhat.io/openshift-service-mesh/sidecar-injector-rhel8"
+"openshift-update-service/cincinnati-operator-bundle" = "registry.redhat.io/openshift-update-service/cincinnati-operator-bundle"
+"openshift-update-service/openshift-update-service-rhel8" = "registry.redhat.io/openshift-update-service/openshift-update-service-rhel8"
+"openshift-update-service/openshift-update-service-rhel8-operator" = "registry.redhat.io/openshift-update-service/openshift-update-service-rhel8-operator"
+"openshift/cloud-network-config-controller-rhel8" = "registry.redhat.io/openshift/cloud-network-config-controller-rhel8"
+"openshift/cluster-nfd-operator" = "registry.access.redhat.com/openshift/cluster-nfd-operator"
+"openshift/metallb-rhel9" = "registry.redhat.io/openshift/metallb-rhel9"
+"openshift3/apb-base" = "registry.access.redhat.com/openshift3/apb-base"
+"openshift3/apb-tools" = "registry.access.redhat.com/openshift3/apb-tools"
+"openshift3/automation-broker-apb" = "registry.access.redhat.com/openshift3/automation-broker-apb"
+"openshift3/grafana" = "registry.access.redhat.com/openshift3/grafana"
+"openshift3/image-inspector" = "registry.access.redhat.com/openshift3/image-inspector"
+"openshift3/jenkins-2-rhel7" = "registry.access.redhat.com/openshift3/jenkins-2-rhel7"
+"openshift3/jenkins-agent-maven-35-rhel7" = "registry.access.redhat.com/openshift3/jenkins-agent-maven-35-rhel7"
+"openshift3/jenkins-agent-maven-36-rhel7" = "registry.redhat.io/openshift3/jenkins-agent-maven-36-rhel7"
+"openshift3/jenkins-agent-nodejs-12-rhel7" = "registry.redhat.io/openshift3/jenkins-agent-nodejs-12-rhel7"
+"openshift3/jenkins-slave-base-rhel7" = "registry.access.redhat.com/openshift3/jenkins-slave-base-rhel7"
+"openshift3/kuryr-cni" = "registry.redhat.io/openshift3/kuryr-cni"
+"openshift3/kuryr-controller" = "registry.access.redhat.com/openshift3/kuryr-controller"
+"openshift3/logging-elasticsearch" = "registry.access.redhat.com/openshift3/logging-elasticsearch"
+"openshift3/logging-elasticsearch5" = "registry.access.redhat.com/openshift3/logging-elasticsearch5"
+"openshift3/logging-fluentd" = "registry.access.redhat.com/openshift3/logging-fluentd"
+"openshift3/mariadb-apb" = "registry.access.redhat.com/openshift3/mariadb-apb"
+"openshift3/mediawiki" = "registry.access.redhat.com/openshift3/mediawiki"
+"openshift3/mediawiki-apb" = "registry.access.redhat.com/openshift3/mediawiki-apb"
+"openshift3/metrics-cassandra" = "registry.access.redhat.com/openshift3/metrics-cassandra"
+"openshift3/metrics-hawkular-metrics" = "registry.access.redhat.com/openshift3/metrics-hawkular-metrics"
+"openshift3/metrics-heapster" = "registry.access.redhat.com/openshift3/metrics-heapster"
+"openshift3/mysql-apb" = "registry.access.redhat.com/openshift3/mysql-apb"
+"openshift3/node" = "registry.access.redhat.com/openshift3/node"
+"openshift3/oauth-proxy" = "registry.access.redhat.com/openshift3/oauth-proxy"
+"openshift3/openshift-ansible-installer" = "registry.access.redhat.com/openshift3/openshift-ansible-installer"
+"openshift3/ose" = "registry.access.redhat.com/openshift3/ose"
+"openshift3/ose-ansible" = "registry.access.redhat.com/openshift3/ose-ansible"
+"openshift3/ose-ansible-service-broker" = "registry.access.redhat.com/openshift3/ose-ansible-service-broker"
+"openshift3/ose-autoheal" = "registry.access.redhat.com/openshift3/ose-autoheal"
+"openshift3/ose-cli" = "registry.access.redhat.com/openshift3/ose-cli"
+"openshift3/ose-cluster-autoscaler" = "registry.access.redhat.com/openshift3/ose-cluster-autoscaler"
+"openshift3/ose-cluster-capacity" = "registry.access.redhat.com/openshift3/ose-cluster-capacity"
+"openshift3/ose-cluster-monitoring-operator" = "registry.access.redhat.com/openshift3/ose-cluster-monitoring-operator"
+"openshift3/ose-configmap-reloader" = "registry.access.redhat.com/openshift3/ose-configmap-reloader"
+"openshift3/ose-console" = "registry.access.redhat.com/openshift3/ose-console"
+"openshift3/ose-control-plane" = "registry.access.redhat.com/openshift3/ose-control-plane"
+"openshift3/ose-deployer" = "registry.access.redhat.com/openshift3/ose-deployer"
+"openshift3/ose-docker-builder" = "registry.access.redhat.com/openshift3/ose-docker-builder"
+"openshift3/ose-docker-registry" = "registry.access.redhat.com/openshift3/ose-docker-registry"
+"openshift3/ose-egress-dns-proxy" = "registry.access.redhat.com/openshift3/ose-egress-dns-proxy"
+"openshift3/ose-egress-http-proxy" = "registry.access.redhat.com/openshift3/ose-egress-http-proxy"
+"openshift3/ose-egress-router" = "registry.access.redhat.com/openshift3/ose-egress-router"
+"openshift3/ose-federation" = "registry.access.redhat.com/openshift3/ose-federation"
+"openshift3/ose-haproxy-router" = "registry.access.redhat.com/openshift3/ose-haproxy-router"
+"openshift3/ose-hyperkube" = "registry.access.redhat.com/openshift3/ose-hyperkube"
+"openshift3/ose-hypershift" = "registry.access.redhat.com/openshift3/ose-hypershift"
+"openshift3/ose-keepalived-ipfailover" = "registry.access.redhat.com/openshift3/ose-keepalived-ipfailover"
+"openshift3/ose-kube-rbac-proxy" = "registry.access.redhat.com/openshift3/ose-kube-rbac-proxy"
+"openshift3/ose-kube-state-metrics" = "registry.access.redhat.com/openshift3/ose-kube-state-metrics"
+"openshift3/ose-kuryr-cni" = "registry.redhat.io/openshift3/ose-kuryr-cni"
+"openshift3/ose-kuryr-controller" = "registry.redhat.io/openshift3/ose-kuryr-controller"
+"openshift3/ose-logging-curator5" = "registry.access.redhat.com/openshift3/ose-logging-curator5"
+"openshift3/ose-logging-elasticsearch" = "registry.access.redhat.com/openshift3/ose-logging-elasticsearch"
+"openshift3/ose-logging-elasticsearch5" = "registry.access.redhat.com/openshift3/ose-logging-elasticsearch5"
+"openshift3/ose-logging-eventrouter" = "registry.access.redhat.com/openshift3/ose-logging-eventrouter"
+"openshift3/ose-logging-fluentd" = "registry.access.redhat.com/openshift3/ose-logging-fluentd"
+"openshift3/ose-logging-kibana5" = "registry.access.redhat.com/openshift3/ose-logging-kibana5"
+"openshift3/ose-metrics-cassandra" = "registry.access.redhat.com/openshift3/ose-metrics-cassandra"
+"openshift3/ose-metrics-hawkular-metrics" = "registry.access.redhat.com/openshift3/ose-metrics-hawkular-metrics"
+"openshift3/ose-metrics-heapster" = "registry.access.redhat.com/openshift3/ose-metrics-heapster"
+"openshift3/ose-metrics-schema-installer" = "registry.access.redhat.com/openshift3/ose-metrics-schema-installer"
+"openshift3/ose-metrics-server" = "registry.access.redhat.com/openshift3/ose-metrics-server"
+"openshift3/ose-node" = "registry.access.redhat.com/openshift3/ose-node"
+"openshift3/ose-operator-lifecycle-manager" = "registry.access.redhat.com/openshift3/ose-operator-lifecycle-manager"
+"openshift3/ose-pod" = "registry.access.redhat.com/openshift3/ose-pod"
+"openshift3/ose-prometheus-config-reloader" = "registry.access.redhat.com/openshift3/ose-prometheus-config-reloader"
+"openshift3/ose-recycler" = "registry.access.redhat.com/openshift3/ose-recycler"
+"openshift3/ose-service-catalog" = "registry.access.redhat.com/openshift3/ose-service-catalog"
+"openshift3/ose-service-serving-cert-signer" = "registry.access.redhat.com/openshift3/ose-service-serving-cert-signer"
+"openshift3/ose-template-service-broker" = "registry.access.redhat.com/openshift3/ose-template-service-broker"
+"openshift3/ose-tests" = "registry.access.redhat.com/openshift3/ose-tests"
+"openshift3/ose-web-console" = "registry.access.redhat.com/openshift3/ose-web-console"
+"openshift3/postgresql-apb" = "registry.access.redhat.com/openshift3/postgresql-apb"
+"openshift3/prometheus" = "registry.access.redhat.com/openshift3/prometheus"
 "openshift3/prometheus-alertmanager" = "registry.access.redhat.com/openshift3/prometheus-alertmanager"
 "openshift3/prometheus-node-exporter" = "registry.access.redhat.com/openshift3/prometheus-node-exporter"
-"openshift3/prometheus" = "registry.access.redhat.com/openshift3/prometheus"
 "openshift3/registry-console" = "registry.access.redhat.com/openshift3/registry-console"
-"openshift4/apb-tools" = "registry.redhat.io/openshift4/apb-tools"
+"openshift4-wincw/windows-machine-config-operator-bundle" = "registry.redhat.io/openshift4-wincw/windows-machine-config-operator-bundle"
+"openshift4-wincw/windows-machine-config-rhel8-operator" = "registry.redhat.io/openshift4-wincw/windows-machine-config-rhel8-operator"
+"openshift4/cloud-event-proxy-rhel8" = "registry.redhat.io/openshift4/cloud-event-proxy-rhel8"
 "openshift4/cluster-etcd-rhel7-operator" = "registry.redhat.io/openshift4/cluster-etcd-rhel7-operator"
 "openshift4/cnf-tests-rhel8" = "registry.redhat.io/openshift4/cnf-tests-rhel8"
 "openshift4/egress-router-cni-alt-rhel8" = "registry.redhat.io/openshift4/egress-router-cni-alt-rhel8"
@@ -669,12 +778,9 @@
 "openshift4/jenkins-agent-nodejs-12-rhel7" = "registry.redhat.io/openshift4/jenkins-agent-nodejs-12-rhel7"
 "openshift4/kubernetes-nmstate-operator-bundle" = "registry.redhat.io/openshift4/kubernetes-nmstate-operator-bundle"
 "openshift4/kubernetes-nmstate-rhel8-operator" = "registry.redhat.io/openshift4/kubernetes-nmstate-rhel8-operator"
-"openshift4/mediawiki-apb" = "registry.redhat.io/openshift4/mediawiki-apb"
-"openshift4/mediawiki" = "registry.redhat.io/openshift4/mediawiki"
 "openshift4/metallb-operator-rhel8" = "registry.redhat.io/openshift4/metallb-operator-rhel8"
 "openshift4/openshift-node-maintenance-rhel8-operator" = "registry.redhat.io/openshift4/openshift-node-maintenance-rhel8-operator"
 "openshift4/ose-ansible-operator" = "registry.redhat.io/openshift4/ose-ansible-operator"
-"openshift4/ose-ansible-service-broker" = "registry.redhat.io/openshift4/ose-ansible-service-broker"
 "openshift4/ose-aws-machine-controllers" = "registry.redhat.io/openshift4/ose-aws-machine-controllers"
 "openshift4/ose-aws-pod-identity-webhook-rhel7" = "registry.redhat.io/openshift4/ose-aws-pod-identity-webhook-rhel7"
 "openshift4/ose-aws-pod-identity-webhook-rhel8" = "registry.redhat.io/openshift4/ose-aws-pod-identity-webhook-rhel8"
@@ -683,12 +789,12 @@
 "openshift4/ose-baremetal-runtimecfg-container-rhel7" = "registry.redhat.io/openshift4/ose-baremetal-runtimecfg-container-rhel7"
 "openshift4/ose-baremetal-runtimecfg-rhel7" = "registry.redhat.io/openshift4/ose-baremetal-runtimecfg-rhel7"
 "openshift4/ose-baremetal-runtimecfg-rhel8" = "registry.redhat.io/openshift4/ose-baremetal-runtimecfg-rhel8"
-"openshift4/ose-cli-artifacts" = "registry.redhat.io/openshift4/ose-cli-artifacts"
 "openshift4/ose-cli" = "registry.redhat.io/openshift4/ose-cli"
+"openshift4/ose-cli-artifacts" = "registry.redhat.io/openshift4/ose-cli-artifacts"
 "openshift4/ose-cloud-credential-operator" = "registry.redhat.io/openshift4/ose-cloud-credential-operator"
 "openshift4/ose-cluster-authentication-operator" = "registry.redhat.io/openshift4/ose-cluster-authentication-operator"
-"openshift4/ose-cluster-autoscaler-operator" = "registry.redhat.io/openshift4/ose-cluster-autoscaler-operator"
 "openshift4/ose-cluster-autoscaler" = "registry.redhat.io/openshift4/ose-cluster-autoscaler"
+"openshift4/ose-cluster-autoscaler-operator" = "registry.redhat.io/openshift4/ose-cluster-autoscaler-operator"
 "openshift4/ose-cluster-baremetal-operator-rhel8" = "registry.redhat.io/openshift4/ose-cluster-baremetal-operator-rhel8"
 "openshift4/ose-cluster-bootstrap" = "registry.redhat.io/openshift4/ose-cluster-bootstrap"
 "openshift4/ose-cluster-capacity" = "registry.redhat.io/openshift4/ose-cluster-capacity"
@@ -717,30 +823,29 @@
 "openshift4/ose-cluster-openshift-controller-manager-operator" = "registry.redhat.io/openshift4/ose-cluster-openshift-controller-manager-operator"
 "openshift4/ose-cluster-policy-controller-rhel7" = "registry.redhat.io/openshift4/ose-cluster-policy-controller-rhel7"
 "openshift4/ose-cluster-policy-controller-rhel8" = "registry.redhat.io/openshift4/ose-cluster-policy-controller-rhel8"
-"openshift4/ose-clusterresourceoverride-operator-bundle" = "registry.redhat.io/openshift4/ose-clusterresourceoverride-operator-bundle"
-"openshift4/ose-clusterresourceoverride-rhel7-operator" = "registry.redhat.io/openshift4/ose-clusterresourceoverride-rhel7-operator"
-"openshift4/ose-clusterresourceoverride-rhel7" = "registry.redhat.io/openshift4/ose-clusterresourceoverride-rhel7"
-"openshift4/ose-clusterresourceoverride-rhel8-operator" = "registry.redhat.io/openshift4/ose-clusterresourceoverride-rhel8-operator"
-"openshift4/ose-clusterresourceoverride-rhel8" = "registry.redhat.io/openshift4/ose-clusterresourceoverride-rhel8"
+"openshift4/ose-cluster-samples-operator" = "registry.redhat.io/openshift4/ose-cluster-samples-operator"
 "openshift4/ose-cluster-storage-operator" = "registry.redhat.io/openshift4/ose-cluster-storage-operator"
 "openshift4/ose-cluster-svcat-apiserver-operator" = "registry.redhat.io/openshift4/ose-cluster-svcat-apiserver-operator"
 "openshift4/ose-cluster-svcat-controller-manager-operator" = "registry.redhat.io/openshift4/ose-cluster-svcat-controller-manager-operator"
 "openshift4/ose-cluster-update-keys" = "registry.redhat.io/openshift4/ose-cluster-update-keys"
 "openshift4/ose-cluster-version-operator" = "registry.redhat.io/openshift4/ose-cluster-version-operator"
+"openshift4/ose-clusterresourceoverride-operator-bundle" = "registry.redhat.io/openshift4/ose-clusterresourceoverride-operator-bundle"
+"openshift4/ose-clusterresourceoverride-rhel7" = "registry.redhat.io/openshift4/ose-clusterresourceoverride-rhel7"
+"openshift4/ose-clusterresourceoverride-rhel7-operator" = "registry.redhat.io/openshift4/ose-clusterresourceoverride-rhel7-operator"
+"openshift4/ose-clusterresourceoverride-rhel8" = "registry.redhat.io/openshift4/ose-clusterresourceoverride-rhel8"
+"openshift4/ose-clusterresourceoverride-rhel8-operator" = "registry.redhat.io/openshift4/ose-clusterresourceoverride-rhel8-operator"
 "openshift4/ose-configmap-reloader" = "registry.redhat.io/openshift4/ose-configmap-reloader"
-"openshift4/ose-console-operator" = "registry.redhat.io/openshift4/ose-console-operator"
 "openshift4/ose-console" = "registry.redhat.io/openshift4/ose-console"
+"openshift4/ose-console-operator" = "registry.redhat.io/openshift4/ose-console-operator"
 "openshift4/ose-container-networking-plugins-rhel7" = "registry.redhat.io/openshift4/ose-container-networking-plugins-rhel7"
 "openshift4/ose-container-networking-plugins-rhel8" = "registry.redhat.io/openshift4/ose-container-networking-plugins-rhel8"
-"openshift4/ose-container-networking-plugins-supported" = "registry.redhat.io/openshift4/ose-container-networking-plugins-supported"
-"openshift4/ose-container-networking-plugins-unsupported" = "registry.redhat.io/openshift4/ose-container-networking-plugins-unsupported"
-"openshift4/ose-csi-driver-manila-rhel7-operator" = "registry.redhat.io/openshift4/ose-csi-driver-manila-rhel7-operator"
+"openshift4/ose-coredns" = "registry.redhat.io/openshift4/ose-coredns"
 "openshift4/ose-csi-driver-manila-rhel7" = "registry.redhat.io/openshift4/ose-csi-driver-manila-rhel7"
-"openshift4/ose-csi-driver-manila-rhel8-operator" = "registry.redhat.io/openshift4/ose-csi-driver-manila-rhel8-operator"
+"openshift4/ose-csi-driver-manila-rhel7-operator" = "registry.redhat.io/openshift4/ose-csi-driver-manila-rhel7-operator"
 "openshift4/ose-csi-driver-manila-rhel8" = "registry.redhat.io/openshift4/ose-csi-driver-manila-rhel8"
+"openshift4/ose-csi-driver-manila-rhel8-operator" = "registry.redhat.io/openshift4/ose-csi-driver-manila-rhel8-operator"
 "openshift4/ose-csi-driver-nfs-rhel7" = "registry.redhat.io/openshift4/ose-csi-driver-nfs-rhel7"
 "openshift4/ose-csi-driver-nfs-rhel8" = "registry.redhat.io/openshift4/ose-csi-driver-nfs-rhel8"
-"openshift4/ose-csi-driver-registrar" = "registry.redhat.io/openshift4/ose-csi-driver-registrar"
 "openshift4/ose-csi-external-attacher" = "registry.redhat.io/openshift4/ose-csi-external-attacher"
 "openshift4/ose-csi-external-attacher-rhel7" = "registry.redhat.io/openshift4/ose-csi-external-attacher-rhel7"
 "openshift4/ose-csi-external-attacher-rhel8" = "registry.redhat.io/openshift4/ose-csi-external-attacher-rhel8"
@@ -768,30 +873,26 @@
 "openshift4/ose-gcp-machine-controllers-rhel8" = "registry.redhat.io/openshift4/ose-gcp-machine-controllers-rhel8"
 "openshift4/ose-ghostunnel" = "registry.redhat.io/openshift4/ose-ghostunnel"
 "openshift4/ose-grafana" = "registry.redhat.io/openshift4/ose-grafana"
-"openshift4/ose-haproxy-router-base" = "registry.redhat.io/openshift4/ose-haproxy-router-base"
 "openshift4/ose-haproxy-router" = "registry.redhat.io/openshift4/ose-haproxy-router"
 "openshift4/ose-hello-openshift-rhel8" = "registry.redhat.io/openshift4/ose-hello-openshift-rhel8"
 "openshift4/ose-helm-operator" = "registry.redhat.io/openshift4/ose-helm-operator"
 "openshift4/ose-hyperkube" = "registry.redhat.io/openshift4/ose-hyperkube"
-"openshift4/ose-hypershift" = "registry.redhat.io/openshift4/ose-hypershift"
 "openshift4/ose-insights-rhel7-operator" = "registry.redhat.io/openshift4/ose-insights-rhel7-operator"
 "openshift4/ose-insights-rhel8-operator" = "registry.redhat.io/openshift4/ose-insights-rhel8-operator"
-"openshift4/ose-installer-artifacts" = "registry.redhat.io/openshift4/ose-installer-artifacts"
 "openshift4/ose-installer" = "registry.redhat.io/openshift4/ose-installer"
+"openshift4/ose-installer-artifacts" = "registry.redhat.io/openshift4/ose-installer-artifacts"
+"openshift4/ose-jenkins" = "registry.redhat.io/openshift4/ose-jenkins"
 "openshift4/ose-jenkins-agent-base" = "registry.redhat.io/openshift4/ose-jenkins-agent-base"
 "openshift4/ose-jenkins-agent-maven" = "registry.redhat.io/openshift4/ose-jenkins-agent-maven"
 "openshift4/ose-jenkins-agent-nodejs-10-rhel8" = "registry.redhat.io/openshift4/ose-jenkins-agent-nodejs-10-rhel8"
 "openshift4/ose-jenkins-agent-nodejs-12-rhel8" = "registry.redhat.io/openshift4/ose-jenkins-agent-nodejs-12-rhel8"
-"openshift4/ose-jenkins" = "registry.redhat.io/openshift4/ose-jenkins"
 "openshift4/ose-keepalived-ipfailover" = "registry.redhat.io/openshift4/ose-keepalived-ipfailover"
-"openshift4/ose-kube-client-agent" = "registry.redhat.io/openshift4/ose-kube-client-agent"
-"openshift4/ose-kube-etcd-signer-server" = "registry.redhat.io/openshift4/ose-kube-etcd-signer-server"
 "openshift4/ose-kube-proxy" = "registry.redhat.io/openshift4/ose-kube-proxy"
 "openshift4/ose-kube-rbac-proxy" = "registry.redhat.io/openshift4/ose-kube-rbac-proxy"
-"openshift4/ose-kubernetes-nmstate-handler-rhel8" = "registry.redhat.io/openshift4/ose-kubernetes-nmstate-handler-rhel8"
 "openshift4/ose-kube-state-metrics" = "registry.redhat.io/openshift4/ose-kube-state-metrics"
 "openshift4/ose-kube-storage-version-migrator-rhel7" = "registry.redhat.io/openshift4/ose-kube-storage-version-migrator-rhel7"
 "openshift4/ose-kube-storage-version-migrator-rhel8" = "registry.redhat.io/openshift4/ose-kube-storage-version-migrator-rhel8"
+"openshift4/ose-kubernetes-nmstate-handler-rhel8" = "registry.redhat.io/openshift4/ose-kubernetes-nmstate-handler-rhel8"
 "openshift4/ose-kuryr-cni-rhel8" = "registry.redhat.io/openshift4/ose-kuryr-cni-rhel8"
 "openshift4/ose-kuryr-controller-rhel8" = "registry.redhat.io/openshift4/ose-kuryr-controller-rhel8"
 "openshift4/ose-libvirt-machine-controllers" = "registry.redhat.io/openshift4/ose-libvirt-machine-controllers"
@@ -800,16 +901,13 @@
 "openshift4/ose-local-storage-operator" = "registry.redhat.io/openshift4/ose-local-storage-operator"
 "openshift4/ose-local-storage-static-provisioner" = "registry.redhat.io/openshift4/ose-local-storage-static-provisioner"
 "openshift4/ose-logging-curator5" = "registry.redhat.io/openshift4/ose-logging-curator5"
-"openshift4/ose-logging-elasticsearch6" = "registry.redhat.io/openshift4/ose-logging-elasticsearch6"
 "openshift4/ose-logging-elasticsearch-rhel7" = "registry.redhat.io/openshift4/ose-logging-elasticsearch-rhel7"
+"openshift4/ose-logging-elasticsearch6" = "registry.redhat.io/openshift4/ose-logging-elasticsearch6"
 "openshift4/ose-logging-eventrouter" = "registry.redhat.io/openshift4/ose-logging-eventrouter"
 "openshift4/ose-logging-fluentd" = "registry.redhat.io/openshift4/ose-logging-fluentd"
 "openshift4/ose-logging-kibana6" = "registry.redhat.io/openshift4/ose-logging-kibana6"
 "openshift4/ose-machine-api-operator" = "registry.redhat.io/openshift4/ose-machine-api-operator"
-"openshift4/ose-machine-config-controller" = "registry.redhat.io/openshift4/ose-machine-config-controller"
-"openshift4/ose-machine-config-daemon" = "registry.redhat.io/openshift4/ose-machine-config-daemon"
 "openshift4/ose-machine-config-operator" = "registry.redhat.io/openshift4/ose-machine-config-operator"
-"openshift4/ose-machine-config-server" = "registry.redhat.io/openshift4/ose-machine-config-server"
 "openshift4/ose-mdns-publisher-rhel7" = "registry.redhat.io/openshift4/ose-mdns-publisher-rhel7"
 "openshift4/ose-mdns-publisher-rhel8" = "registry.redhat.io/openshift4/ose-mdns-publisher-rhel8"
 "openshift4/ose-metering-ansible-operator" = "registry.redhat.io/openshift4/ose-metering-ansible-operator"
@@ -825,7 +923,6 @@
 "openshift4/ose-network-metrics-daemon-container-rhel7" = "registry.redhat.io/openshift4/ose-network-metrics-daemon-container-rhel7"
 "openshift4/ose-network-metrics-daemon-rhel8" = "registry.redhat.io/openshift4/ose-network-metrics-daemon-rhel8"
 "openshift4/ose-node-feature-discovery" = "registry.redhat.io/openshift4/ose-node-feature-discovery"
-"openshift4/ose-node" = "registry.redhat.io/openshift4/ose-node"
 "openshift4/ose-oauth-proxy" = "registry.redhat.io/openshift4/ose-oauth-proxy"
 "openshift4/ose-oauth-server-rhel7" = "registry.redhat.io/openshift4/ose-oauth-server-rhel7"
 "openshift4/ose-oauth-server-rhel8" = "registry.redhat.io/openshift4/ose-oauth-server-rhel8"
@@ -834,8 +931,8 @@
 "openshift4/ose-openshift-controller-manager-rhel7" = "registry.redhat.io/openshift4/ose-openshift-controller-manager-rhel7"
 "openshift4/ose-openshift-controller-manager-rhel8" = "registry.redhat.io/openshift4/ose-openshift-controller-manager-rhel8"
 "openshift4/ose-openshift-proxy-pull-test-rhel8" = "registry.redhat.io/openshift4/ose-openshift-proxy-pull-test-rhel8"
-"openshift4/ose-openstack-cinder-csi-driver-rhel8-operator" = "registry.redhat.io/openshift4/ose-openstack-cinder-csi-driver-rhel8-operator"
 "openshift4/ose-openstack-cinder-csi-driver-rhel8" = "registry.redhat.io/openshift4/ose-openstack-cinder-csi-driver-rhel8"
+"openshift4/ose-openstack-cinder-csi-driver-rhel8-operator" = "registry.redhat.io/openshift4/ose-openstack-cinder-csi-driver-rhel8-operator"
 "openshift4/ose-openstack-machine-controllers" = "registry.redhat.io/openshift4/ose-openstack-machine-controllers"
 "openshift4/ose-operator-lifecycle-manager" = "registry.redhat.io/openshift4/ose-operator-lifecycle-manager"
 "openshift4/ose-operator-marketplace" = "registry.redhat.io/openshift4/ose-operator-marketplace"
@@ -844,150 +941,45 @@
 "openshift4/ose-ovirt-machine-controllers-rhel7" = "registry.redhat.io/openshift4/ose-ovirt-machine-controllers-rhel7"
 "openshift4/ose-ovirt-machine-controllers-rhel8" = "registry.redhat.io/openshift4/ose-ovirt-machine-controllers-rhel8"
 "openshift4/ose-pod" = "registry.redhat.io/openshift4/ose-pod"
+"openshift4/ose-prom-label-proxy" = "registry.redhat.io/openshift4/ose-prom-label-proxy"
+"openshift4/ose-prometheus" = "registry.redhat.io/openshift4/ose-prometheus"
 "openshift4/ose-prometheus-alertmanager" = "registry.redhat.io/openshift4/ose-prometheus-alertmanager"
 "openshift4/ose-prometheus-config-reloader" = "registry.redhat.io/openshift4/ose-prometheus-config-reloader"
 "openshift4/ose-prometheus-node-exporter" = "registry.redhat.io/openshift4/ose-prometheus-node-exporter"
-"openshift4/ose-prometheus" = "registry.redhat.io/openshift4/ose-prometheus"
-"openshift4/ose-prom-label-proxy" = "registry.redhat.io/openshift4/ose-prom-label-proxy"
 "openshift4/ose-ptp-operator-metadata" = "registry.redhat.io/openshift4/ose-ptp-operator-metadata"
-"openshift4/ose-recycler" = "registry.redhat.io/openshift4/ose-recycler"
-"openshift4/ose-sdn-controller-rhel7" = "registry.redhat.io/openshift4/ose-sdn-controller-rhel7"
 "openshift4/ose-sdn-rhel7" = "registry.redhat.io/openshift4/ose-sdn-rhel7"
 "openshift4/ose-sdn-rhel8" = "registry.redhat.io/openshift4/ose-sdn-rhel8"
 "openshift4/ose-service-ca-operator" = "registry.redhat.io/openshift4/ose-service-ca-operator"
-"openshift4/ose-service-catalog" = "registry.redhat.io/openshift4/ose-service-catalog"
 "openshift4/ose-service-idler-rhel7" = "registry.redhat.io/openshift4/ose-service-idler-rhel7"
 "openshift4/ose-service-idler-rhel8" = "registry.redhat.io/openshift4/ose-service-idler-rhel8"
 "openshift4/ose-sriov-infiniband-cni" = "registry.redhat.io/openshift4/ose-sriov-infiniband-cni"
 "openshift4/ose-sriov-network-operator-bundle" = "registry.redhat.io/openshift4/ose-sriov-network-operator-bundle"
 "openshift4/ose-sriov-operator-must-gather" = "registry.redhat.io/openshift4/ose-sriov-operator-must-gather"
 "openshift4/ose-telemeter" = "registry.redhat.io/openshift4/ose-telemeter"
-"openshift4/ose-template-service-broker" = "registry.redhat.io/openshift4/ose-template-service-broker"
 "openshift4/ose-template-service-broker-rhel7-operator-metadata" = "registry.redhat.io/openshift4/ose-template-service-broker-rhel7-operator-metadata"
 "openshift4/ose-tests" = "registry.redhat.io/openshift4/ose-tests"
 "openshift4/ose-tools-rhel7" = "registry.redhat.io/openshift4/ose-tools-rhel7"
 "openshift4/ose-tools-rhel8" = "registry.redhat.io/openshift4/ose-tools-rhel8"
 "openshift4/ose-vertical-pod-autoscaler-operator-bundle" = "registry.redhat.io/openshift4/ose-vertical-pod-autoscaler-operator-bundle"
-"openshift4/ose-vertical-pod-autoscaler-rhel7-operator" = "registry.redhat.io/openshift4/ose-vertical-pod-autoscaler-rhel7-operator"
 "openshift4/ose-vertical-pod-autoscaler-rhel7" = "registry.redhat.io/openshift4/ose-vertical-pod-autoscaler-rhel7"
-"openshift4/ose-vertical-pod-autoscaler-rhel8-operator" = "registry.redhat.io/openshift4/ose-vertical-pod-autoscaler-rhel8-operator"
+"openshift4/ose-vertical-pod-autoscaler-rhel7-operator" = "registry.redhat.io/openshift4/ose-vertical-pod-autoscaler-rhel7-operator"
 "openshift4/ose-vertical-pod-autoscaler-rhel8" = "registry.redhat.io/openshift4/ose-vertical-pod-autoscaler-rhel8"
+"openshift4/ose-vertical-pod-autoscaler-rhel8-operator" = "registry.redhat.io/openshift4/ose-vertical-pod-autoscaler-rhel8-operator"
 "openshift4/ose-vsphere-problem-detector-rhel8" = "registry.redhat.io/openshift4/ose-vsphere-problem-detector-rhel8"
-"openshift4/ovirt-csi-driver-rhel7-operator" = "registry.redhat.io/openshift4/ovirt-csi-driver-rhel7-operator"
 "openshift4/ovirt-csi-driver-rhel7" = "registry.redhat.io/openshift4/ovirt-csi-driver-rhel7"
-"openshift4/ovirt-csi-driver-rhel8-operator" = "registry.redhat.io/openshift4/ovirt-csi-driver-rhel8-operator"
+"openshift4/ovirt-csi-driver-rhel7-operator" = "registry.redhat.io/openshift4/ovirt-csi-driver-rhel7-operator"
 "openshift4/ovirt-csi-driver-rhel8" = "registry.redhat.io/openshift4/ovirt-csi-driver-rhel8"
+"openshift4/ovirt-csi-driver-rhel8-operator" = "registry.redhat.io/openshift4/ovirt-csi-driver-rhel8-operator"
 "openshift4/performance-addon-operator-bundle-registry-container-rhel8" = "registry.redhat.io/openshift4/performance-addon-operator-bundle-registry-container-rhel8"
 "openshift4/performance-addon-operator-must-gather-rhel8" = "registry.redhat.io/openshift4/performance-addon-operator-must-gather-rhel8"
 "openshift4/performance-addon-rhel8-operator" = "registry.redhat.io/openshift4/performance-addon-rhel8-operator"
 "openshift4/ptp-must-gather-rhel8" = "registry.redhat.io/openshift4/ptp-must-gather-rhel8"
 "openshift4/sriov-network-webhook-rhel7" = "registry.redhat.io/openshift4/sriov-network-webhook-rhel7"
-"openshift4-wincw/windows-machine-config-operator-bundle" = "registry.redhat.io/openshift4-wincw/windows-machine-config-operator-bundle"
-"openshift4-wincw/windows-machine-config-rhel8-operator" = "registry.redhat.io/openshift4-wincw/windows-machine-config-rhel8-operator"
-"openshift/cloud-network-config-controller-rhel8" = "registry.redhat.io/openshift/cloud-network-config-controller-rhel8"
-"openshift/cluster-nfd-operator" = "registry.access.redhat.com/openshift/cluster-nfd-operator"
 "openshiftdo/odo-init-image-rhel7" = "registry.redhat.io/openshiftdo/odo-init-image-rhel7"
-"openshift-gitops-1/applicationset-rhel8" = "registry.redhat.io/openshift-gitops-1/applicationset-rhel8"
-"openshift-gitops-1/argocd-rhel8" = "registry.redhat.io/openshift-gitops-1/argocd-rhel8"
-"openshift-gitops-1/gitops-operator-bundle" = "registry.redhat.io/openshift-gitops-1/gitops-operator-bundle"
-"openshift-gitops-1/gitops-rhel8-operator" = "registry.redhat.io/openshift-gitops-1/gitops-rhel8-operator"
-"openshift-gitops-1/gitops-rhel8" = "registry.redhat.io/openshift-gitops-1/gitops-rhel8"
-"openshift-gitops-1/kam-delivery-rhel8" = "registry.redhat.io/openshift-gitops-1/kam-delivery-rhel8"
-"openshift-istio/kiali-operator-metadata" = "registry.redhat.io/openshift-istio/kiali-operator-metadata"
-"openshift-logging/cluster-logging-operator-bundle" = "registry.redhat.io/openshift-logging/cluster-logging-operator-bundle"
-"openshift-logging/cluster-logging-rhel8-operator" = "registry.redhat.io/openshift-logging/cluster-logging-rhel8-operator"
-"openshift-logging/elasticsearch6-rhel8" = "registry.redhat.io/openshift-logging/elasticsearch6-rhel8"
-"openshift-logging/elasticsearch-operator-bundle" = "registry.redhat.io/openshift-logging/elasticsearch-operator-bundle"
-"openshift-logging/elasticsearch-proxy-rhel8" = "registry.redhat.io/openshift-logging/elasticsearch-proxy-rhel8"
-"openshift-logging/elasticsearch-rhel8-operator" = "registry.redhat.io/openshift-logging/elasticsearch-rhel8-operator"
-"openshift-logging/eventrouter-rhel8" = "registry.redhat.io/openshift-logging/eventrouter-rhel8"
-"openshift-logging/fluentd-rhel8" = "registry.redhat.io/openshift-logging/fluentd-rhel8"
-"openshift-logging/kibana6-rhel8" = "registry.redhat.io/openshift-logging/kibana6-rhel8"
-"openshift-logging/logging-curator5-rhel8" = "registry.redhat.io/openshift-logging/logging-curator5-rhel8"
-"openshift/metallb-rhel9" = "registry.redhat.io/openshift/metallb-rhel9"
-"openshift-metering/ose-metering-ghostunnel-rhel8" = "registry.redhat.io/openshift-metering/ose-metering-ghostunnel-rhel8"
-"openshift-metering/ose-metering-hadoop-rhel8" = "registry.redhat.io/openshift-metering/ose-metering-hadoop-rhel8"
-"openshift-pipelines/pipelines-cli-tkn-rhel8" = "registry.redhat.io/openshift-pipelines/pipelines-cli-tkn-rhel8"
-"openshift-pipelines/pipelines-controller-rhel8" = "registry.redhat.io/openshift-pipelines/pipelines-controller-rhel8"
-"openshift-pipelines/pipelines-entrypoint-rhel8" = "registry.redhat.io/openshift-pipelines/pipelines-entrypoint-rhel8"
-"openshift-pipelines/pipelines-git-init-rhel8" = "registry.redhat.io/openshift-pipelines/pipelines-git-init-rhel8"
-"openshift-pipelines/pipelines-imagedigestexporter-rhel8" = "registry.redhat.io/openshift-pipelines/pipelines-imagedigestexporter-rhel8"
-"openshift-pipelines/pipelines-kubeconfigwriter-rhel8" = "registry.redhat.io/openshift-pipelines/pipelines-kubeconfigwriter-rhel8"
-"openshift-pipelines/pipelines-nop-rhel8" = "registry.redhat.io/openshift-pipelines/pipelines-nop-rhel8"
-"openshift-pipelines/pipelines-operator-bundle" = "registry.redhat.io/openshift-pipelines/pipelines-operator-bundle"
-"openshift-pipelines/pipelines-operator-proxy-rhel8" = "registry.redhat.io/openshift-pipelines/pipelines-operator-proxy-rhel8"
-"openshift-pipelines/pipelines-pullrequest-init-rhel8" = "registry.redhat.io/openshift-pipelines/pipelines-pullrequest-init-rhel8"
-"openshift-pipelines/pipelines-rhel8-operator" = "registry.redhat.io/openshift-pipelines/pipelines-rhel8-operator"
-"openshift-pipelines/pipelines-triggers-controller-rhel8" = "registry.redhat.io/openshift-pipelines/pipelines-triggers-controller-rhel8"
-"openshift-pipelines/pipelines-triggers-core-interceptors-rhel8" = "registry.redhat.io/openshift-pipelines/pipelines-triggers-core-interceptors-rhel8"
-"openshift-pipelines/pipelines-triggers-eventlistenersink-rhel8" = "registry.redhat.io/openshift-pipelines/pipelines-triggers-eventlistenersink-rhel8"
-"openshift-pipelines/pipelines-triggers-webhook-rhel8" = "registry.redhat.io/openshift-pipelines/pipelines-triggers-webhook-rhel8"
-"openshift-pipelines/pipelines-webhook-rhel8" = "registry.redhat.io/openshift-pipelines/pipelines-webhook-rhel8"
-"openshift-serverless-1/client-kn-rhel8" = "registry.redhat.io/openshift-serverless-1/client-kn-rhel8"
-"openshift-serverless-1/eventing-apiserver-receive-adapter-rhel8" = "registry.redhat.io/openshift-serverless-1/eventing-apiserver-receive-adapter-rhel8"
-"openshift-serverless-1/eventing-controller-rhel8" = "registry.redhat.io/openshift-serverless-1/eventing-controller-rhel8"
-"openshift-serverless-1/eventing-in-memory-channel-controller-rhel8" = "registry.redhat.io/openshift-serverless-1/eventing-in-memory-channel-controller-rhel8"
-"openshift-serverless-1/eventing-in-memory-channel-dispatcher-rhel8" = "registry.redhat.io/openshift-serverless-1/eventing-in-memory-channel-dispatcher-rhel8"
-"openshift-serverless-1/eventing-kafka-channel-controller-rhel8" = "registry.redhat.io/openshift-serverless-1/eventing-kafka-channel-controller-rhel8"
-"openshift-serverless-1/eventing-kafka-channel-dispatcher-rhel8" = "registry.redhat.io/openshift-serverless-1/eventing-kafka-channel-dispatcher-rhel8"
-"openshift-serverless-1/eventing-kafka-channel-webhook-rhel8" = "registry.redhat.io/openshift-serverless-1/eventing-kafka-channel-webhook-rhel8"
-"openshift-serverless-1/eventing-kafka-source-controller-rhel8" = "registry.redhat.io/openshift-serverless-1/eventing-kafka-source-controller-rhel8"
-"openshift-serverless-1/eventing-kafka-source-receive-adapter-rhel8" = "registry.redhat.io/openshift-serverless-1/eventing-kafka-source-receive-adapter-rhel8"
-"openshift-serverless-1/eventing-kafka-storage-version-migration-rhel8" = "registry.redhat.io/openshift-serverless-1/eventing-kafka-storage-version-migration-rhel8"
-"openshift-serverless-1/eventing-mtbroker-filter-rhel8" = "registry.redhat.io/openshift-serverless-1/eventing-mtbroker-filter-rhel8"
-"openshift-serverless-1/eventing-mtbroker-ingress-rhel8" = "registry.redhat.io/openshift-serverless-1/eventing-mtbroker-ingress-rhel8"
-"openshift-serverless-1/eventing-mtchannel-broker-rhel8" = "registry.redhat.io/openshift-serverless-1/eventing-mtchannel-broker-rhel8"
-"openshift-serverless-1/eventing-mtping-rhel8" = "registry.redhat.io/openshift-serverless-1/eventing-mtping-rhel8"
-"openshift-serverless-1/eventing-ping-rhel8" = "registry.redhat.io/openshift-serverless-1/eventing-ping-rhel8"
-"openshift-serverless-1/eventing-ping-source-cleanup-rhel8" = "registry.redhat.io/openshift-serverless-1/eventing-ping-source-cleanup-rhel8"
-"openshift-serverless-1/eventing-storage-version-migration-rhel8" = "registry.redhat.io/openshift-serverless-1/eventing-storage-version-migration-rhel8"
-"openshift-serverless-1/eventing-sugar-controller-rhel8" = "registry.redhat.io/openshift-serverless-1/eventing-sugar-controller-rhel8"
-"openshift-serverless-1/eventing-webhook-rhel8" = "registry.redhat.io/openshift-serverless-1/eventing-webhook-rhel8"
-"openshift-serverless-1/ingress-rhel8-operator" = "registry.redhat.io/openshift-serverless-1/ingress-rhel8-operator"
-"openshift-serverless-1/knative-rhel8-operator" = "registry.redhat.io/openshift-serverless-1/knative-rhel8-operator"
-"openshift-serverless-1/knative-serving-rhel8-operator" = "registry.redhat.io/openshift-serverless-1/knative-serving-rhel8-operator"
-"openshift-serverless-1/kn-cli-artifacts-rhel8" = "registry.redhat.io/openshift-serverless-1/kn-cli-artifacts-rhel8"
-"openshift-serverless-1/kourier-control-rhel8" = "registry.redhat.io/openshift-serverless-1/kourier-control-rhel8"
-"openshift-serverless-1/net-istio-controller-rhel8" = "registry.redhat.io/openshift-serverless-1/net-istio-controller-rhel8"
-"openshift-serverless-1/net-istio-webhook-rhel8" = "registry.redhat.io/openshift-serverless-1/net-istio-webhook-rhel8"
-"openshift-serverless-1/serverless-operator-bundle" = "registry.redhat.io/openshift-serverless-1/serverless-operator-bundle"
-"openshift-serverless-1/serverless-rhel8-operator" = "registry.redhat.io/openshift-serverless-1/serverless-rhel8-operator"
-"openshift-serverless-1/serving-activator-rhel8" = "registry.redhat.io/openshift-serverless-1/serving-activator-rhel8"
-"openshift-serverless-1/serving-autoscaler-hpa-rhel8" = "registry.redhat.io/openshift-serverless-1/serving-autoscaler-hpa-rhel8"
-"openshift-serverless-1/serving-autoscaler-rhel8" = "registry.redhat.io/openshift-serverless-1/serving-autoscaler-rhel8"
-"openshift-serverless-1/serving-controller-rhel8" = "registry.redhat.io/openshift-serverless-1/serving-controller-rhel8"
-"openshift-serverless-1/serving-domain-mapper-rhel8" = "registry.redhat.io/openshift-serverless-1/serving-domain-mapper-rhel8"
-"openshift-serverless-1/serving-domain-mapping-rhel8" = "registry.redhat.io/openshift-serverless-1/serving-domain-mapping-rhel8"
-"openshift-serverless-1/serving-domain-mapping-webhook-rhel8" = "registry.redhat.io/openshift-serverless-1/serving-domain-mapping-webhook-rhel8"
-"openshift-serverless-1/serving-queue-rhel8" = "registry.redhat.io/openshift-serverless-1/serving-queue-rhel8"
-"openshift-serverless-1/serving-storage-version-migration-rhel8" = "registry.redhat.io/openshift-serverless-1/serving-storage-version-migration-rhel8"
-"openshift-serverless-1/serving-webhook-rhel8" = "registry.redhat.io/openshift-serverless-1/serving-webhook-rhel8"
-"openshift-serverless-1/svls-must-gather-rhel8" = "registry.redhat.io/openshift-serverless-1/svls-must-gather-rhel8"
-"openshift-service-mesh/3scale-istio-adapter-rhel8" = "registry.redhat.io/openshift-service-mesh/3scale-istio-adapter-rhel8"
-"openshift-service-mesh/citadel-rhel8" = "registry.redhat.io/openshift-service-mesh/citadel-rhel8"
-"openshift-service-mesh/galley-rhel8" = "registry.redhat.io/openshift-service-mesh/galley-rhel8"
-"openshift-service-mesh/grafana-rhel8" = "registry.redhat.io/openshift-service-mesh/grafana-rhel8"
-"openshift-service-mesh/ior-rhel8" = "registry.redhat.io/openshift-service-mesh/ior-rhel8"
-"openshift-service-mesh/istio-cni-rhel8" = "registry.redhat.io/openshift-service-mesh/istio-cni-rhel8"
-"openshift-service-mesh/istio-must-gather-rhel8" = "registry.redhat.io/openshift-service-mesh/istio-must-gather-rhel8"
-"openshift-service-mesh/istio-rhel8-operator" = "registry.redhat.io/openshift-service-mesh/istio-rhel8-operator"
-"openshift-service-mesh/kiali-rhel7" = "registry.redhat.io/openshift-service-mesh/kiali-rhel7"
-"openshift-service-mesh/kiali-rhel8-operator" = "registry.redhat.io/openshift-service-mesh/kiali-rhel8-operator"
-"openshift-service-mesh/kiali-rhel8" = "registry.redhat.io/openshift-service-mesh/kiali-rhel8"
-"openshift-service-mesh/mixer-rhel8" = "registry.redhat.io/openshift-service-mesh/mixer-rhel8"
-"openshift-service-mesh/pilot-rhel8" = "registry.redhat.io/openshift-service-mesh/pilot-rhel8"
-"openshift-service-mesh/prometheus-rhel8" = "registry.redhat.io/openshift-service-mesh/prometheus-rhel8"
-"openshift-service-mesh/proxy-init-rhel7" = "registry.redhat.io/openshift-service-mesh/proxy-init-rhel7"
-"openshift-service-mesh/proxy-init-rhel8" = "registry.redhat.io/openshift-service-mesh/proxy-init-rhel8"
-"openshift-service-mesh/proxyv2-rhel8" = "registry.redhat.io/openshift-service-mesh/proxyv2-rhel8"
-"openshift-service-mesh/sidecar-injector-rhel8" = "registry.redhat.io/openshift-service-mesh/sidecar-injector-rhel8"
-"openshift-update-service/cincinnati-operator-bundle" = "registry.redhat.io/openshift-update-service/cincinnati-operator-bundle"
-"openshift-update-service/openshift-update-service-rhel8-operator" = "registry.redhat.io/openshift-update-service/openshift-update-service-rhel8-operator"
-"openshift-update-service/openshift-update-service-rhel8" = "registry.redhat.io/openshift-update-service/openshift-update-service-rhel8"
-"operatr-io/kpow-66" = "registry.redhat.io/operatr-io/kpow-66"
 "operatr-io/kpow" = "registry.connect.redhat.com/operatr-io/kpow"
-"operatr-io/operatr-io-operator-48" = "registry.redhat.io/operatr-io/operatr-io-operator-48"
+"operatr-io/kpow-66" = "registry.redhat.io/operatr-io/kpow-66"
 "operatr-io/operatr-io" = "registry.connect.redhat.com/operatr-io/operatr-io"
+"operatr-io/operatr-io-operator-48" = "registry.redhat.io/operatr-io/operatr-io-operator-48"
 "organization/edb/postgres-advanced-server-10" = "quay.io/organization/edb/postgres-advanced-server-10"
 "organization/edb/postgres-advanced-server-11" = "quay.io/organization/edb/postgres-advanced-server-11"
 "organization/edb/postgresql-11" = "quay.io/organization/edb/postgresql-11"
@@ -1011,12 +1003,12 @@
 "quay/quay-openshift-bridge-rhel8-operator" = "registry.redhat.io/quay/quay-openshift-bridge-rhel8-operator"
 "quay/quay-operator-bundle" = "registry.redhat.io/quay/quay-operator-bundle"
 "quay/quay-operator-rhel8" = "registry.redhat.io/quay/quay-operator-rhel8"
-"quay/quay-rhel8-operator" = "registry.redhat.io/quay/quay-rhel8-operator"
 "quay/quay-rhel8" = "registry.redhat.io/quay/quay-rhel8"
+"quay/quay-rhel8-operator" = "registry.redhat.io/quay/quay-rhel8-operator"
 "redhat-cse/atiwary-rhel7" = "registry.redhat.io/redhat-cse/atiwary-rhel7"
 "redhat-openjdk-18/openjdk18-openshift" = "registry.access.redhat.com/redhat-openjdk-18/openjdk18-openshift"
-"redhat/redhat-operator-index" = "registry.redhat.io/redhat/redhat-operator-index"
 "redhat-sp/testwebserver" = "registry.redhat.io/redhat-sp/testwebserver"
+"redhat/redhat-operator-index" = "registry.redhat.io/redhat/redhat-operator-index"
 "redislabs/alpha" = "registry.connect.redhat.com/redislabs/alpha"
 "redislabs/redis-enterprise-operator-cert" = "registry.connect.redhat.com/redislabs/redis-enterprise-operator-cert"
 "repository/edb/edb-operator" = "quay.io/repository/edb/edb-operator"
@@ -1024,17 +1016,31 @@
 "repository/edb/postgresql-10" = "registry.redhat.io/repository/edb/postgresql-10"
 "repository/edb/stolon" = "quay.io/repository/edb/stolon"
 "repository/opencloudio/ibm-monitoring-grafana-operator" = "quay.io/repository/opencloudio/ibm-monitoring-grafana-operator"
-"rhacm2/acmesolver-rhel8" = "registry.redhat.io/rhacm2/acmesolver-rhel8"
+"rh-acs/collector" = "registry.redhat.io/rh-acs/collector"
+"rh-marketplace/marketplace-csi-driver" = "quay.io/rh-marketplace/marketplace-csi-driver"
+"rh-marketplace/marketplace-dataset-operator" = "registry.redhat.io/rh-marketplace/marketplace-dataset-operator"
+"rh-marketplace/redhat-marketplace-authcheck" = "quay.io/rh-marketplace/redhat-marketplace-authcheck"
+"rh-marketplace/redhat-marketplace-metric-state" = "quay.io/rh-marketplace/redhat-marketplace-metric-state"
+"rh-marketplace/redhat-marketplace-operator" = "registry.connect.redhat.com/rh-marketplace/redhat-marketplace-operator"
+"rh-marketplace/redhat-marketplace-reporter" = "registry.connect.redhat.com/rh-marketplace/redhat-marketplace-reporter"
+"rh-sso-7/sso74-openj9-openshift-rhel8" = "registry.redhat.io/rh-sso-7/sso74-openj9-openshift-rhel8"
+"rh-sso-7/sso74-openshift-rhel8" = "registry.redhat.io/rh-sso-7/sso74-openshift-rhel8"
+"rhacm2/acm-grafana-rhel8" = "registry.redhat.io/rhacm2/acm-grafana-rhel8"
 "rhacm2/acm-must-gather-rhel8" = "registry.redhat.io/rhacm2/acm-must-gather-rhel8"
+"rhacm2/acmesolver-rhel8" = "registry.redhat.io/rhacm2/acmesolver-rhel8"
+"rhacm2/agent-service-rhel8" = "registry.redhat.io/rhacm2/agent-service-rhel8"
 "rhacm2/application-ui-rhel8" = "registry.redhat.io/rhacm2/application-ui-rhel8"
+"rhacm2/assisted-installer-agent-rhel8" = "registry.redhat.io/rhacm2/assisted-installer-agent-rhel8"
+"rhacm2/assisted-installer-reporter-rhel8" = "registry.redhat.io/rhacm2/assisted-installer-reporter-rhel8"
+"rhacm2/assisted-installer-rhel8" = "registry.redhat.io/rhacm2/assisted-installer-rhel8"
 "rhacm2/cainjector-rhel8" = "registry.redhat.io/rhacm2/cainjector-rhel8"
 "rhacm2/cert-manager-controller-rhel8" = "registry.redhat.io/rhacm2/cert-manager-controller-rhel8"
 "rhacm2/cert-manager-webhook-rhel8" = "registry.redhat.io/rhacm2/cert-manager-webhook-rhel8"
 "rhacm2/cert-policy-controller-rhel8" = "registry.redhat.io/rhacm2/cert-policy-controller-rhel8"
 "rhacm2/cluster-curator-controller-rhel8" = "registry.redhat.io/rhacm2/cluster-curator-controller-rhel8"
 "rhacm2/clusterlifecycle-state-metrics-rhel8" = "registry.redhat.io/rhacm2/clusterlifecycle-state-metrics-rhel8"
-"rhacm2/configmap-watcher-rhel8" = "registry.redhat.io/rhacm2/configmap-watcher-rhel8"
 "rhacm2/config-policy-controller-rhel8" = "registry.redhat.io/rhacm2/config-policy-controller-rhel8"
+"rhacm2/configmap-watcher-rhel8" = "registry.redhat.io/rhacm2/configmap-watcher-rhel8"
 "rhacm2/console-api-rhel8" = "registry.redhat.io/rhacm2/console-api-rhel8"
 "rhacm2/console-header-rhel8" = "registry.redhat.io/rhacm2/console-header-rhel8"
 "rhacm2/console-rhel8" = "registry.redhat.io/rhacm2/console-rhel8"
@@ -1044,8 +1050,8 @@
 "rhacm2/endpoint-monitoring-rhel8-operator" = "registry.redhat.io/rhacm2/endpoint-monitoring-rhel8-operator"
 "rhacm2/endpoint-rhel8-operator" = "registry.redhat.io/rhacm2/endpoint-rhel8-operator"
 "rhacm2/gatekeeper-operator-bundle" = "registry.redhat.io/rhacm2/gatekeeper-operator-bundle"
-"rhacm2/gatekeeper-rhel8-operator" = "registry.redhat.io/rhacm2/gatekeeper-rhel8-operator"
 "rhacm2/gatekeeper-rhel8" = "registry.redhat.io/rhacm2/gatekeeper-rhel8"
+"rhacm2/gatekeeper-rhel8-operator" = "registry.redhat.io/rhacm2/gatekeeper-rhel8-operator"
 "rhacm2/governance-policy-propagator-rhel8" = "registry.redhat.io/rhacm2/governance-policy-propagator-rhel8"
 "rhacm2/governance-policy-spec-sync-rhel8" = "registry.redhat.io/rhacm2/governance-policy-spec-sync-rhel8"
 "rhacm2/governance-policy-status-sync-rhel8" = "registry.redhat.io/rhacm2/governance-policy-status-sync-rhel8"
@@ -1055,9 +1061,14 @@
 "rhacm2/grc-ui-rhel8" = "registry.redhat.io/rhacm2/grc-ui-rhel8"
 "rhacm2/iam-policy-controller-rhel8" = "registry.redhat.io/rhacm2/iam-policy-controller-rhel8"
 "rhacm2/insights-client-rhel8" = "registry.redhat.io/rhacm2/insights-client-rhel8"
+"rhacm2/insights-metrics-rhel8" = "registry.redhat.io/rhacm2/insights-metrics-rhel8"
+"rhacm2/klusterlet-addon-controller-rhel8" = "registry.redhat.io/rhacm2/klusterlet-addon-controller-rhel8"
 "rhacm2/klusterlet-addon-lease-controller-rhel8" = "registry.redhat.io/rhacm2/klusterlet-addon-lease-controller-rhel8"
+"rhacm2/klusterlet-addon-rhel8-operator" = "registry.redhat.io/rhacm2/klusterlet-addon-rhel8-operator"
 "rhacm2/klusterlet-operator-bundle" = "registry.redhat.io/rhacm2/klusterlet-operator-bundle"
+"rhacm2/kube-rbac-proxy-rhel8" = "registry.redhat.io/rhacm2/kube-rbac-proxy-rhel8"
 "rhacm2/kui-web-terminal-rhel8" = "registry.redhat.io/rhacm2/kui-web-terminal-rhel8"
+"rhacm2/managedcluster-import-controller-rhel8" = "registry.redhat.io/rhacm2/managedcluster-import-controller-rhel8"
 "rhacm2/management-ingress-rhel7" = "registry.redhat.io/rhacm2/management-ingress-rhel7"
 "rhacm2/mcm-topology-api-rhel8" = "registry.redhat.io/rhacm2/mcm-topology-api-rhel8"
 "rhacm2/mcm-topology-rhel8" = "registry.redhat.io/rhacm2/mcm-topology-rhel8"
@@ -1065,8 +1076,6 @@
 "rhacm2/memcached-rhel8" = "registry.redhat.io/rhacm2/memcached-rhel8"
 "rhacm2/metrics-collector-rhel8" = "registry.redhat.io/rhacm2/metrics-collector-rhel8"
 "rhacm2/multicloud-manager-rhel8" = "registry.redhat.io/rhacm2/multicloud-manager-rhel8"
-"rhacm2/multiclusterhub-repo-rhel8" = "registry.redhat.io/rhacm2/multiclusterhub-repo-rhel8"
-"rhacm2/multiclusterhub-rhel8" = "registry.redhat.io/rhacm2/multiclusterhub-rhel8"
 "rhacm2/multicluster-observability-rhel8-operator" = "registry.redhat.io/rhacm2/multicluster-observability-rhel8-operator"
 "rhacm2/multicluster-operators-application-rhel8" = "registry.redhat.io/rhacm2/multicluster-operators-application-rhel8"
 "rhacm2/multicluster-operators-channel-rhel8" = "registry.redhat.io/rhacm2/multicluster-operators-channel-rhel8"
@@ -1074,18 +1083,22 @@
 "rhacm2/multicluster-operators-placementrule-rhel8" = "registry.redhat.io/rhacm2/multicluster-operators-placementrule-rhel8"
 "rhacm2/multicluster-operators-subscription-release-rhel8" = "registry.redhat.io/rhacm2/multicluster-operators-subscription-release-rhel8"
 "rhacm2/multicluster-operators-subscription-rhel8" = "registry.redhat.io/rhacm2/multicluster-operators-subscription-rhel8"
-"rhacm2/observatorium-rhel8-operator" = "registry.redhat.io/rhacm2/observatorium-rhel8-operator"
+"rhacm2/multiclusterhub-repo-rhel8" = "registry.redhat.io/rhacm2/multiclusterhub-repo-rhel8"
+"rhacm2/multiclusterhub-rhel8" = "registry.redhat.io/rhacm2/multiclusterhub-rhel8"
 "rhacm2/observatorium-rhel8" = "registry.redhat.io/rhacm2/observatorium-rhel8"
+"rhacm2/observatorium-rhel8-operator" = "registry.redhat.io/rhacm2/observatorium-rhel8-operator"
 "rhacm2/openshift-hive-rhel7" = "registry.redhat.io/rhacm2/openshift-hive-rhel7"
 "rhacm2/openshift-hive-rhel8" = "registry.redhat.io/rhacm2/openshift-hive-rhel8"
+"rhacm2/placement-rhel8" = "registry.redhat.io/rhacm2/placement-rhel8"
 "rhacm2/prometheus-alertmanager-rhel8" = "registry.redhat.io/rhacm2/prometheus-alertmanager-rhel8"
 "rhacm2/provider-credential-controller-rhel8" = "registry.redhat.io/rhacm2/provider-credential-controller-rhel8"
 "rhacm2/rbac-query-proxy-rhel8" = "registry.redhat.io/rhacm2/rbac-query-proxy-rhel8"
 "rhacm2/rcm-controller-rhel8" = "registry.redhat.io/rhacm2/rcm-controller-rhel8"
 "rhacm2/redisgraph-tls-rhel8" = "registry.redhat.io/rhacm2/redisgraph-tls-rhel8"
-"rhacm2/registration-rhel8-operator" = "registry.redhat.io/rhacm2/registration-rhel8-operator"
 "rhacm2/registration-rhel8" = "registry.redhat.io/rhacm2/registration-rhel8"
+"rhacm2/registration-rhel8-operator" = "registry.redhat.io/rhacm2/registration-rhel8-operator"
 "rhacm2/search-aggregator-rhel7" = "registry.redhat.io/rhacm2/search-aggregator-rhel7"
+"rhacm2/search-aggregator-rhel8" = "registry.redhat.io/rhacm2/search-aggregator-rhel8"
 "rhacm2/search-api-rhel8" = "registry.redhat.io/rhacm2/search-api-rhel8"
 "rhacm2/search-collector-rhel8" = "registry.redhat.io/rhacm2/search-collector-rhel8"
 "rhacm2/search-rhel8" = "registry.redhat.io/rhacm2/search-rhel8"
@@ -1094,7 +1107,6 @@
 "rhacm2/thanos-receive-controller-rhel8" = "registry.redhat.io/rhacm2/thanos-receive-controller-rhel8"
 "rhacm2/thanos-rhel7" = "registry.redhat.io/rhacm2/thanos-rhel7"
 "rhacm2/work-rhel8" = "registry.redhat.io/rhacm2/work-rhel8"
-"rh-acs/collector" = "registry.redhat.io/rh-acs/collector"
 "rhacs/collector" = "registry.redhat.io/rhacs/collector"
 "rhceph/ansible-runner" = "registry.redhat.io/rhceph/ansible-runner"
 "rhceph/ansible-runner-rhel8" = "registry.redhat.io/rhceph/ansible-runner-rhel8"
@@ -1103,28 +1115,33 @@
 "rhceph/rhceph-3-rhel7" = "registry.access.redhat.com/rhceph/rhceph-3-rhel7"
 "rhceph/rhceph-4-dashboard-rhel8" = "registry.redhat.io/rhceph/rhceph-4-dashboard-rhel8"
 "rhceph/rhceph-4-rhel8" = "registry.redhat.io/rhceph/rhceph-4-rhel8"
+"rhcertification/redhat-certification-baremetal" = "registry.redhat.io/rhcertification/redhat-certification-baremetal"
 "rhcertification/redhat-certification-management" = "registry.access.redhat.com/rhcertification/redhat-certification-management"
-"rhdm-7/rhdm73-businesscentral-openshift" = "registry.redhat.io/rhdm-7/rhdm73-businesscentral-openshift"
 "rhdm-7/rhdm-controller-rhel8" = "registry.redhat.io/rhdm-7/rhdm-controller-rhel8"
 "rhdm-7/rhdm-decisioncentral-rhel8" = "registry.redhat.io/rhdm-7/rhdm-decisioncentral-rhel8"
 "rhdm-7/rhdm-kieserver-rhel8" = "registry.redhat.io/rhdm-7/rhdm-kieserver-rhel8"
-"rhel6.10" = "registry.access.redhat.com/rhel6.10"
-"rhel6-init" = "registry.access.redhat.com/rhel6-init"
+"rhdm-7/rhdm73-businesscentral-openshift" = "registry.redhat.io/rhdm-7/rhdm73-businesscentral-openshift"
+"rhel" = "registry.access.redhat.com/rhel"
+"rhel-atomic" = "registry.access.redhat.com/rhel-atomic"
+"rhel-init" = "registry.access.redhat.com/rhel-init"
+"rhel-minimal" = "registry.access.redhat.com/rhel-minimal"
 "rhel6" = "registry.access.redhat.com/rhel6"
+"rhel6-init" = "registry.access.redhat.com/rhel6-init"
+"rhel6.10" = "registry.access.redhat.com/rhel6.10"
 "rhel6/rhel" = "registry.access.redhat.com/rhel6/rhel"
-"rhel7.9" = "registry.access.redhat.com/rhel7.9"
+"rhel7" = "registry.access.redhat.com/rhel7"
 "rhel7-atomic" = "registry.access.redhat.com/rhel7-atomic"
+"rhel7-init" = "registry.access.redhat.com/rhel7-init"
+"rhel7-minimal" = "registry.access.redhat.com/rhel7-minimal"
+"rhel7.9" = "registry.access.redhat.com/rhel7.9"
 "rhel7/cockpit-ws" = "registry.access.redhat.com/rhel7/cockpit-ws"
 "rhel7/etcd" = "registry.access.redhat.com/rhel7/etcd"
 "rhel7/flannel" = "registry.access.redhat.com/rhel7/flannel"
-"rhel7-init" = "registry.access.redhat.com/rhel7-init"
-"rhel7-minimal" = "registry.access.redhat.com/rhel7-minimal"
 "rhel7/net-snmp" = "registry.access.redhat.com/rhel7/net-snmp"
-"rhel7/openscap" = "registry.access.redhat.com/rhel7/openscap"
 "rhel7/open-vm-tools" = "registry.access.redhat.com/rhel7/open-vm-tools"
-"rhel7" = "registry.access.redhat.com/rhel7"
-"rhel7/rhel-atomic" = "registry.access.redhat.com/rhel7/rhel-atomic"
+"rhel7/openscap" = "registry.access.redhat.com/rhel7/openscap"
 "rhel7/rhel" = "registry.access.redhat.com/rhel7/rhel"
+"rhel7/rhel-atomic" = "registry.access.redhat.com/rhel7/rhel-atomic"
 "rhel7/rhel-tools" = "registry.access.redhat.com/rhel7/rhel-tools"
 "rhel7/rsyslog" = "registry.access.redhat.com/rhel7/rsyslog"
 "rhel7/sadc" = "registry.access.redhat.com/rhel7/sadc"
@@ -1138,17 +1155,13 @@
 "rhel8/dotnet-31-runtime" = "registry.redhat.io/rhel8/dotnet-31-runtime"
 "rhel8/dotnet-50" = "registry.redhat.io/rhel8/dotnet-50"
 "rhel8/dotnet-50-runtime" = "registry.redhat.io/rhel8/dotnet-50-runtime"
-"rhel8/firefox-flatpak" = "registry.redhat.io/rhel8/firefox-flatpak"
 "rhel8/flatpak-runtime" = "registry.redhat.io/rhel8/flatpak-runtime"
 "rhel8/flatpak-sdk" = "registry.redhat.io/rhel8/flatpak-sdk"
 "rhel8/gcc-toolset-10-perftools" = "registry.redhat.io/rhel8/gcc-toolset-10-perftools"
 "rhel8/gcc-toolset-10-toolchain" = "registry.redhat.io/rhel8/gcc-toolset-10-toolchain"
-"rhel8/gimp-flatpak" = "registry.redhat.io/rhel8/gimp-flatpak"
 "rhel8/go-toolset" = "registry.redhat.io/rhel8/go-toolset"
 "rhel8/grafana" = "registry.redhat.io/rhel8/grafana"
 "rhel8/httpd-24" = "registry.redhat.io/rhel8/httpd-24"
-"rhel8/inkscape-flatpak" = "registry.redhat.io/rhel8/inkscape-flatpak"
-"rhel8/libreoffice-flatpak" = "registry.redhat.io/rhel8/libreoffice-flatpak"
 "rhel8/mariadb-103" = "registry.redhat.io/rhel8/mariadb-103"
 "rhel8/mariadb-105" = "registry.redhat.io/rhel8/mariadb-105"
 "rhel8/memcached" = "registry.redhat.io/rhel8/memcached"
@@ -1157,8 +1170,8 @@
 "rhel8/nginx-116" = "registry.redhat.io/rhel8/nginx-116"
 "rhel8/nginx-118" = "registry.redhat.io/rhel8/nginx-118"
 "rhel8/nodejs-12" = "registry.redhat.io/rhel8/nodejs-12"
-"rhel8/nodejs-14-minimal" = "registry.redhat.io/rhel8/nodejs-14-minimal"
 "rhel8/nodejs-14" = "registry.redhat.io/rhel8/nodejs-14"
+"rhel8/nodejs-14-minimal" = "registry.redhat.io/rhel8/nodejs-14-minimal"
 "rhel8/pause" = "registry.redhat.io/rhel8/pause"
 "rhel8/pcp" = "registry.redhat.io/rhel8/pcp"
 "rhel8/perl-526" = "registry.redhat.io/rhel8/perl-526"
@@ -1185,21 +1198,10 @@
 "rhel8/skopeo" = "registry.redhat.io/rhel8/skopeo"
 "rhel8/sssd" = "registry.redhat.io/rhel8/sssd"
 "rhel8/support-tools" = "registry.redhat.io/rhel8/support-tools"
-"rhel8/thunderbird-flatpak" = "registry.redhat.io/rhel8/thunderbird-flatpak"
 "rhel8/varnish-6" = "registry.redhat.io/rhel8/varnish-6"
-"rhel-atomic" = "registry.access.redhat.com/rhel-atomic"
-"rhel-init" = "registry.access.redhat.com/rhel-init"
-"rhel-minimal" = "registry.access.redhat.com/rhel-minimal"
-"rhel" = "registry.access.redhat.com/rhel"
 "rhgs3/rhgs-gluster-block-prov-rhel7" = "registry.access.redhat.com/rhgs3/rhgs-gluster-block-prov-rhel7"
 "rhgs3/rhgs-server-rhel7" = "registry.access.redhat.com/rhgs3/rhgs-server-rhel7"
 "rhgs3/rhgs-volmanager-rhel7" = "registry.access.redhat.com/rhgs3/rhgs-volmanager-rhel7"
-"rh-marketplace/marketplace-csi-driver" = "quay.io/rh-marketplace/marketplace-csi-driver"
-"rh-marketplace/marketplace-dataset-operator" = "registry.redhat.io/rh-marketplace/marketplace-dataset-operator"
-"rh-marketplace/redhat-marketplace-authcheck" = "quay.io/rh-marketplace/redhat-marketplace-authcheck"
-"rh-marketplace/redhat-marketplace-metric-state" = "quay.io/rh-marketplace/redhat-marketplace-metric-state"
-"rh-marketplace/redhat-marketplace-operator" = "registry.connect.redhat.com/rh-marketplace/redhat-marketplace-operator"
-"rh-marketplace/redhat-marketplace-reporter" = "registry.connect.redhat.com/rh-marketplace/redhat-marketplace-reporter"
 "rhmtc/openshift-migration-controller-rhel8" = "registry.redhat.io/rhmtc/openshift-migration-controller-rhel8"
 "rhmtc/openshift-migration-hook-runner-rhel7" = "registry.redhat.io/rhmtc/openshift-migration-hook-runner-rhel7"
 "rhmtc/openshift-migration-log-reader-rhel8" = "registry.redhat.io/rhmtc/openshift-migration-log-reader-rhel8"
@@ -1216,6 +1218,115 @@
 "rhmtc/openshift-migration-velero-rhel8" = "registry.redhat.io/rhmtc/openshift-migration-velero-rhel8"
 "rhmtc/openshift-velero-plugin-rhel8" = "registry.redhat.io/rhmtc/openshift-velero-plugin-rhel8"
 "rhoar-nodejs/nodejs-12-rhel7" = "registry.redhat.io/rhoar-nodejs/nodejs-12-rhel7"
+"rhosp-rhel8/openstack-aodh-api" = "registry.redhat.io/rhosp-rhel8/openstack-aodh-api"
+"rhosp-rhel8/openstack-aodh-base" = "registry.redhat.io/rhosp-rhel8/openstack-aodh-base"
+"rhosp-rhel8/openstack-aodh-evaluator" = "registry.redhat.io/rhosp-rhel8/openstack-aodh-evaluator"
+"rhosp-rhel8/openstack-aodh-listener" = "registry.redhat.io/rhosp-rhel8/openstack-aodh-listener"
+"rhosp-rhel8/openstack-aodh-notifier" = "registry.redhat.io/rhosp-rhel8/openstack-aodh-notifier"
+"rhosp-rhel8/openstack-barbican-api" = "registry.redhat.io/rhosp-rhel8/openstack-barbican-api"
+"rhosp-rhel8/openstack-barbican-base" = "registry.redhat.io/rhosp-rhel8/openstack-barbican-base"
+"rhosp-rhel8/openstack-barbican-keystone-listener" = "registry.redhat.io/rhosp-rhel8/openstack-barbican-keystone-listener"
+"rhosp-rhel8/openstack-barbican-worker" = "registry.redhat.io/rhosp-rhel8/openstack-barbican-worker"
+"rhosp-rhel8/openstack-base" = "registry.redhat.io/rhosp-rhel8/openstack-base"
+"rhosp-rhel8/openstack-ceilometer-base" = "registry.redhat.io/rhosp-rhel8/openstack-ceilometer-base"
+"rhosp-rhel8/openstack-ceilometer-central" = "registry.redhat.io/rhosp-rhel8/openstack-ceilometer-central"
+"rhosp-rhel8/openstack-ceilometer-compute" = "registry.redhat.io/rhosp-rhel8/openstack-ceilometer-compute"
+"rhosp-rhel8/openstack-ceilometer-ipmi" = "registry.redhat.io/rhosp-rhel8/openstack-ceilometer-ipmi"
+"rhosp-rhel8/openstack-ceilometer-notification" = "registry.redhat.io/rhosp-rhel8/openstack-ceilometer-notification"
+"rhosp-rhel8/openstack-cinder-api" = "registry.redhat.io/rhosp-rhel8/openstack-cinder-api"
+"rhosp-rhel8/openstack-cinder-backup" = "registry.redhat.io/rhosp-rhel8/openstack-cinder-backup"
+"rhosp-rhel8/openstack-cinder-base" = "registry.redhat.io/rhosp-rhel8/openstack-cinder-base"
+"rhosp-rhel8/openstack-cinder-scheduler" = "registry.redhat.io/rhosp-rhel8/openstack-cinder-scheduler"
+"rhosp-rhel8/openstack-cinder-volume" = "registry.redhat.io/rhosp-rhel8/openstack-cinder-volume"
+"rhosp-rhel8/openstack-collectd" = "registry.redhat.io/rhosp-rhel8/openstack-collectd"
+"rhosp-rhel8/openstack-cron" = "registry.redhat.io/rhosp-rhel8/openstack-cron"
+"rhosp-rhel8/openstack-dependencies" = "registry.redhat.io/rhosp-rhel8/openstack-dependencies"
+"rhosp-rhel8/openstack-ec2-api" = "registry.redhat.io/rhosp-rhel8/openstack-ec2-api"
+"rhosp-rhel8/openstack-etcd" = "registry.redhat.io/rhosp-rhel8/openstack-etcd"
+"rhosp-rhel8/openstack-glance-api" = "registry.redhat.io/rhosp-rhel8/openstack-glance-api"
+"rhosp-rhel8/openstack-glance-base" = "registry.redhat.io/rhosp-rhel8/openstack-glance-base"
+"rhosp-rhel8/openstack-gnocchi-api" = "registry.redhat.io/rhosp-rhel8/openstack-gnocchi-api"
+"rhosp-rhel8/openstack-gnocchi-base" = "registry.redhat.io/rhosp-rhel8/openstack-gnocchi-base"
+"rhosp-rhel8/openstack-gnocchi-metricd" = "registry.redhat.io/rhosp-rhel8/openstack-gnocchi-metricd"
+"rhosp-rhel8/openstack-gnocchi-statsd" = "registry.redhat.io/rhosp-rhel8/openstack-gnocchi-statsd"
+"rhosp-rhel8/openstack-haproxy" = "registry.redhat.io/rhosp-rhel8/openstack-haproxy"
+"rhosp-rhel8/openstack-heat-all" = "registry.redhat.io/rhosp-rhel8/openstack-heat-all"
+"rhosp-rhel8/openstack-heat-api" = "registry.redhat.io/rhosp-rhel8/openstack-heat-api"
+"rhosp-rhel8/openstack-heat-api-cfn" = "registry.redhat.io/rhosp-rhel8/openstack-heat-api-cfn"
+"rhosp-rhel8/openstack-heat-base" = "registry.redhat.io/rhosp-rhel8/openstack-heat-base"
+"rhosp-rhel8/openstack-heat-engine" = "registry.redhat.io/rhosp-rhel8/openstack-heat-engine"
+"rhosp-rhel8/openstack-horizon" = "registry.redhat.io/rhosp-rhel8/openstack-horizon"
+"rhosp-rhel8/openstack-ironic-api" = "registry.redhat.io/rhosp-rhel8/openstack-ironic-api"
+"rhosp-rhel8/openstack-ironic-base" = "registry.redhat.io/rhosp-rhel8/openstack-ironic-base"
+"rhosp-rhel8/openstack-ironic-conductor" = "registry.redhat.io/rhosp-rhel8/openstack-ironic-conductor"
+"rhosp-rhel8/openstack-ironic-inspector" = "registry.redhat.io/rhosp-rhel8/openstack-ironic-inspector"
+"rhosp-rhel8/openstack-ironic-neutron-agent" = "registry.redhat.io/rhosp-rhel8/openstack-ironic-neutron-agent"
+"rhosp-rhel8/openstack-ironic-pxe" = "registry.redhat.io/rhosp-rhel8/openstack-ironic-pxe"
+"rhosp-rhel8/openstack-iscsid" = "registry.redhat.io/rhosp-rhel8/openstack-iscsid"
+"rhosp-rhel8/openstack-keepalived" = "registry.redhat.io/rhosp-rhel8/openstack-keepalived"
+"rhosp-rhel8/openstack-keystone" = "registry.redhat.io/rhosp-rhel8/openstack-keystone"
+"rhosp-rhel8/openstack-keystone-base" = "registry.redhat.io/rhosp-rhel8/openstack-keystone-base"
+"rhosp-rhel8/openstack-manila-api" = "registry.redhat.io/rhosp-rhel8/openstack-manila-api"
+"rhosp-rhel8/openstack-manila-base" = "registry.redhat.io/rhosp-rhel8/openstack-manila-base"
+"rhosp-rhel8/openstack-manila-scheduler" = "registry.redhat.io/rhosp-rhel8/openstack-manila-scheduler"
+"rhosp-rhel8/openstack-manila-share" = "registry.redhat.io/rhosp-rhel8/openstack-manila-share"
+"rhosp-rhel8/openstack-mariadb" = "registry.redhat.io/rhosp-rhel8/openstack-mariadb"
+"rhosp-rhel8/openstack-memcached" = "registry.redhat.io/rhosp-rhel8/openstack-memcached"
+"rhosp-rhel8/openstack-mistral-api" = "registry.redhat.io/rhosp-rhel8/openstack-mistral-api"
+"rhosp-rhel8/openstack-mistral-base" = "registry.redhat.io/rhosp-rhel8/openstack-mistral-base"
+"rhosp-rhel8/openstack-mistral-engine" = "registry.redhat.io/rhosp-rhel8/openstack-mistral-engine"
+"rhosp-rhel8/openstack-mistral-event-engine" = "registry.redhat.io/rhosp-rhel8/openstack-mistral-event-engine"
+"rhosp-rhel8/openstack-mistral-executor" = "registry.redhat.io/rhosp-rhel8/openstack-mistral-executor"
+"rhosp-rhel8/openstack-multipathd" = "registry.redhat.io/rhosp-rhel8/openstack-multipathd"
+"rhosp-rhel8/openstack-neutron-base" = "registry.redhat.io/rhosp-rhel8/openstack-neutron-base"
+"rhosp-rhel8/openstack-neutron-dhcp-agent" = "registry.redhat.io/rhosp-rhel8/openstack-neutron-dhcp-agent"
+"rhosp-rhel8/openstack-neutron-l3-agent" = "registry.redhat.io/rhosp-rhel8/openstack-neutron-l3-agent"
+"rhosp-rhel8/openstack-neutron-metadata-agent" = "registry.redhat.io/rhosp-rhel8/openstack-neutron-metadata-agent"
+"rhosp-rhel8/openstack-neutron-metadata-agent-ovn" = "registry.redhat.io/rhosp-rhel8/openstack-neutron-metadata-agent-ovn"
+"rhosp-rhel8/openstack-neutron-openvswitch-agent" = "registry.redhat.io/rhosp-rhel8/openstack-neutron-openvswitch-agent"
+"rhosp-rhel8/openstack-neutron-server" = "registry.redhat.io/rhosp-rhel8/openstack-neutron-server"
+"rhosp-rhel8/openstack-neutron-server-ovn" = "registry.redhat.io/rhosp-rhel8/openstack-neutron-server-ovn"
+"rhosp-rhel8/openstack-neutron-sriov-agent" = "registry.redhat.io/rhosp-rhel8/openstack-neutron-sriov-agent"
+"rhosp-rhel8/openstack-nova-api" = "registry.redhat.io/rhosp-rhel8/openstack-nova-api"
+"rhosp-rhel8/openstack-nova-base" = "registry.redhat.io/rhosp-rhel8/openstack-nova-base"
+"rhosp-rhel8/openstack-nova-compute" = "registry.redhat.io/rhosp-rhel8/openstack-nova-compute"
+"rhosp-rhel8/openstack-nova-compute-ironic" = "registry.redhat.io/rhosp-rhel8/openstack-nova-compute-ironic"
+"rhosp-rhel8/openstack-nova-conductor" = "registry.redhat.io/rhosp-rhel8/openstack-nova-conductor"
+"rhosp-rhel8/openstack-nova-libvirt" = "registry.redhat.io/rhosp-rhel8/openstack-nova-libvirt"
+"rhosp-rhel8/openstack-nova-novncproxy" = "registry.redhat.io/rhosp-rhel8/openstack-nova-novncproxy"
+"rhosp-rhel8/openstack-nova-scheduler" = "registry.redhat.io/rhosp-rhel8/openstack-nova-scheduler"
+"rhosp-rhel8/openstack-novajoin-base" = "registry.redhat.io/rhosp-rhel8/openstack-novajoin-base"
+"rhosp-rhel8/openstack-novajoin-notifier" = "registry.redhat.io/rhosp-rhel8/openstack-novajoin-notifier"
+"rhosp-rhel8/openstack-novajoin-server" = "registry.redhat.io/rhosp-rhel8/openstack-novajoin-server"
+"rhosp-rhel8/openstack-octavia-api" = "registry.redhat.io/rhosp-rhel8/openstack-octavia-api"
+"rhosp-rhel8/openstack-octavia-base" = "registry.redhat.io/rhosp-rhel8/openstack-octavia-base"
+"rhosp-rhel8/openstack-octavia-health-manager" = "registry.redhat.io/rhosp-rhel8/openstack-octavia-health-manager"
+"rhosp-rhel8/openstack-octavia-housekeeping" = "registry.redhat.io/rhosp-rhel8/openstack-octavia-housekeeping"
+"rhosp-rhel8/openstack-octavia-worker" = "registry.redhat.io/rhosp-rhel8/openstack-octavia-worker"
+"rhosp-rhel8/openstack-openvswitch-base" = "registry.redhat.io/rhosp-rhel8/openstack-openvswitch-base"
+"rhosp-rhel8/openstack-ovn-base" = "registry.redhat.io/rhosp-rhel8/openstack-ovn-base"
+"rhosp-rhel8/openstack-ovn-controller" = "registry.redhat.io/rhosp-rhel8/openstack-ovn-controller"
+"rhosp-rhel8/openstack-ovn-nb-db-server" = "registry.redhat.io/rhosp-rhel8/openstack-ovn-nb-db-server"
+"rhosp-rhel8/openstack-ovn-northd" = "registry.redhat.io/rhosp-rhel8/openstack-ovn-northd"
+"rhosp-rhel8/openstack-ovn-sb-db-server" = "registry.redhat.io/rhosp-rhel8/openstack-ovn-sb-db-server"
+"rhosp-rhel8/openstack-panko-api" = "registry.redhat.io/rhosp-rhel8/openstack-panko-api"
+"rhosp-rhel8/openstack-panko-base" = "registry.redhat.io/rhosp-rhel8/openstack-panko-base"
+"rhosp-rhel8/openstack-placement-api" = "registry.redhat.io/rhosp-rhel8/openstack-placement-api"
+"rhosp-rhel8/openstack-placement-base" = "registry.redhat.io/rhosp-rhel8/openstack-placement-base"
+"rhosp-rhel8/openstack-qdrouterd" = "registry.redhat.io/rhosp-rhel8/openstack-qdrouterd"
+"rhosp-rhel8/openstack-rabbitmq" = "registry.redhat.io/rhosp-rhel8/openstack-rabbitmq"
+"rhosp-rhel8/openstack-redis" = "registry.redhat.io/rhosp-rhel8/openstack-redis"
+"rhosp-rhel8/openstack-redis-base" = "registry.redhat.io/rhosp-rhel8/openstack-redis-base"
+"rhosp-rhel8/openstack-rsyslog" = "registry.redhat.io/rhosp-rhel8/openstack-rsyslog"
+"rhosp-rhel8/openstack-rsyslog-base" = "registry.redhat.io/rhosp-rhel8/openstack-rsyslog-base"
+"rhosp-rhel8/openstack-swift-account" = "registry.redhat.io/rhosp-rhel8/openstack-swift-account"
+"rhosp-rhel8/openstack-swift-base" = "registry.redhat.io/rhosp-rhel8/openstack-swift-base"
+"rhosp-rhel8/openstack-swift-container" = "registry.redhat.io/rhosp-rhel8/openstack-swift-container"
+"rhosp-rhel8/openstack-swift-object" = "registry.redhat.io/rhosp-rhel8/openstack-swift-object"
+"rhosp-rhel8/openstack-swift-proxy-server" = "registry.redhat.io/rhosp-rhel8/openstack-swift-proxy-server"
+"rhosp-rhel8/openstack-tempest" = "registry.redhat.io/rhosp-rhel8/openstack-tempest"
+"rhosp-rhel8/openstack-zaqar-base" = "registry.redhat.io/rhosp-rhel8/openstack-zaqar-base"
+"rhosp-rhel8/openstack-zaqar-wsgi" = "registry.redhat.io/rhosp-rhel8/openstack-zaqar-wsgi"
 "rhosp13/openstack-aodh-api" = "registry.access.redhat.com/rhosp13/openstack-aodh-api"
 "rhosp13/openstack-aodh-base" = "registry.access.redhat.com/rhosp13/openstack-aodh-base"
 "rhosp13/openstack-aodh-evaluator" = "registry.access.redhat.com/rhosp13/openstack-aodh-evaluator"
@@ -1223,7 +1334,7 @@
 "rhosp13/openstack-aodh-notifier" = "registry.access.redhat.com/rhosp13/openstack-aodh-notifier"
 "rhosp13/openstack-barbican-api" = "registry.access.redhat.com/rhosp13/openstack-barbican-api"
 "rhosp13/openstack-barbican-base" = "registry.access.redhat.com/rhosp13/openstack-barbican-base"
-"rhosp13/openstack-barbican-keystone-listener" = "registry.access.redhat.com/rhosp13/openstack-barbican-keystone-listener"
+"rhosp13/openstack-barbican-keystone-listener" = "registry.redhat.io/rhosp13/openstack-barbican-keystone-listener"
 "rhosp13/openstack-barbican-worker" = "registry.access.redhat.com/rhosp13/openstack-barbican-worker"
 "rhosp13/openstack-base" = "registry.access.redhat.com/rhosp13/openstack-base"
 "rhosp13/openstack-ceilometer-base" = "registry.access.redhat.com/rhosp13/openstack-ceilometer-base"
@@ -1250,12 +1361,12 @@
 "rhosp13/openstack-gnocchi-statsd" = "registry.access.redhat.com/rhosp13/openstack-gnocchi-statsd"
 "rhosp13/openstack-haproxy" = "registry.access.redhat.com/rhosp13/openstack-haproxy"
 "rhosp13/openstack-heat-all" = "registry.access.redhat.com/rhosp13/openstack-heat-all"
-"rhosp13/openstack-heat-api-cfn" = "registry.access.redhat.com/rhosp13/openstack-heat-api-cfn"
 "rhosp13/openstack-heat-api" = "registry.access.redhat.com/rhosp13/openstack-heat-api"
+"rhosp13/openstack-heat-api-cfn" = "registry.access.redhat.com/rhosp13/openstack-heat-api-cfn"
 "rhosp13/openstack-heat-base" = "registry.access.redhat.com/rhosp13/openstack-heat-base"
 "rhosp13/openstack-heat-engine" = "registry.access.redhat.com/rhosp13/openstack-heat-engine"
-"rhosp13/openstack-horizon-base" = "registry.redhat.io/rhosp13/openstack-horizon-base"
 "rhosp13/openstack-horizon" = "registry.access.redhat.com/rhosp13/openstack-horizon"
+"rhosp13/openstack-horizon-base" = "registry.redhat.io/rhosp13/openstack-horizon-base"
 "rhosp13/openstack-ironic-api" = "registry.access.redhat.com/rhosp13/openstack-ironic-api"
 "rhosp13/openstack-ironic-base" = "registry.access.redhat.com/rhosp13/openstack-ironic-base"
 "rhosp13/openstack-ironic-conductor" = "registry.access.redhat.com/rhosp13/openstack-ironic-conductor"
@@ -1263,8 +1374,8 @@
 "rhosp13/openstack-ironic-neutron-agent" = "registry.access.redhat.com/rhosp13/openstack-ironic-neutron-agent"
 "rhosp13/openstack-ironic-pxe" = "registry.access.redhat.com/rhosp13/openstack-ironic-pxe"
 "rhosp13/openstack-iscsid" = "registry.access.redhat.com/rhosp13/openstack-iscsid"
-"rhosp13/openstack-keystone-base" = "registry.access.redhat.com/rhosp13/openstack-keystone-base"
 "rhosp13/openstack-keystone" = "registry.access.redhat.com/rhosp13/openstack-keystone"
+"rhosp13/openstack-keystone-base" = "registry.access.redhat.com/rhosp13/openstack-keystone-base"
 "rhosp13/openstack-kuryr-cni" = "registry.access.redhat.com/rhosp13/openstack-kuryr-cni"
 "rhosp13/openstack-kuryr-controller" = "registry.access.redhat.com/rhosp13/openstack-kuryr-controller"
 "rhosp13/openstack-manila-api" = "registry.access.redhat.com/rhosp13/openstack-manila-api"
@@ -1282,17 +1393,17 @@
 "rhosp13/openstack-neutron-base" = "registry.access.redhat.com/rhosp13/openstack-neutron-base"
 "rhosp13/openstack-neutron-dhcp-agent" = "registry.access.redhat.com/rhosp13/openstack-neutron-dhcp-agent"
 "rhosp13/openstack-neutron-l3-agent" = "registry.access.redhat.com/rhosp13/openstack-neutron-l3-agent"
-"rhosp13/openstack-neutron-metadata-agent-ovn" = "registry.access.redhat.com/rhosp13/openstack-neutron-metadata-agent-ovn"
 "rhosp13/openstack-neutron-metadata-agent" = "registry.access.redhat.com/rhosp13/openstack-neutron-metadata-agent"
+"rhosp13/openstack-neutron-metadata-agent-ovn" = "registry.access.redhat.com/rhosp13/openstack-neutron-metadata-agent-ovn"
 "rhosp13/openstack-neutron-openvswitch-agent" = "registry.access.redhat.com/rhosp13/openstack-neutron-openvswitch-agent"
+"rhosp13/openstack-neutron-server" = "registry.access.redhat.com/rhosp13/openstack-neutron-server"
 "rhosp13/openstack-neutron-server-opendaylight" = "registry.access.redhat.com/rhosp13/openstack-neutron-server-opendaylight"
 "rhosp13/openstack-neutron-server-ovn" = "registry.access.redhat.com/rhosp13/openstack-neutron-server-ovn"
-"rhosp13/openstack-neutron-server" = "registry.access.redhat.com/rhosp13/openstack-neutron-server"
 "rhosp13/openstack-neutron-sriov-agent" = "registry.access.redhat.com/rhosp13/openstack-neutron-sriov-agent"
 "rhosp13/openstack-nova-api" = "registry.access.redhat.com/rhosp13/openstack-nova-api"
 "rhosp13/openstack-nova-base" = "registry.access.redhat.com/rhosp13/openstack-nova-base"
-"rhosp13/openstack-nova-compute-ironic" = "registry.access.redhat.com/rhosp13/openstack-nova-compute-ironic"
 "rhosp13/openstack-nova-compute" = "registry.access.redhat.com/rhosp13/openstack-nova-compute"
+"rhosp13/openstack-nova-compute-ironic" = "registry.access.redhat.com/rhosp13/openstack-nova-compute-ironic"
 "rhosp13/openstack-nova-conductor" = "registry.access.redhat.com/rhosp13/openstack-nova-conductor"
 "rhosp13/openstack-nova-consoleauth" = "registry.access.redhat.com/rhosp13/openstack-nova-consoleauth"
 "rhosp13/openstack-nova-libvirt" = "registry.access.redhat.com/rhosp13/openstack-nova-libvirt"
@@ -1314,8 +1425,8 @@
 "rhosp13/openstack-panko-api" = "registry.access.redhat.com/rhosp13/openstack-panko-api"
 "rhosp13/openstack-panko-base" = "registry.access.redhat.com/rhosp13/openstack-panko-base"
 "rhosp13/openstack-rabbitmq" = "registry.access.redhat.com/rhosp13/openstack-rabbitmq"
-"rhosp13/openstack-redis-base" = "registry.access.redhat.com/rhosp13/openstack-redis-base"
 "rhosp13/openstack-redis" = "registry.access.redhat.com/rhosp13/openstack-redis"
+"rhosp13/openstack-redis-base" = "registry.access.redhat.com/rhosp13/openstack-redis-base"
 "rhosp13/openstack-sahara-api" = "registry.access.redhat.com/rhosp13/openstack-sahara-api"
 "rhosp13/openstack-sahara-base" = "registry.access.redhat.com/rhosp13/openstack-sahara-base"
 "rhosp13/openstack-sahara-engine" = "registry.access.redhat.com/rhosp13/openstack-sahara-engine"
@@ -1330,129 +1441,20 @@
 "rhosp13/openstack-zaqar" = "registry.access.redhat.com/rhosp13/openstack-zaqar"
 "rhosp15-rhel8/openstack-kuryr-controller" = "registry.redhat.io/rhosp15-rhel8/openstack-kuryr-controller"
 "rhosp15-rhel8/openstack-skydive-agent" = "registry.redhat.io/rhosp15-rhel8/openstack-skydive-agent"
-"rhosp-rhel8/openstack-aodh-api" = "registry.redhat.io/rhosp-rhel8/openstack-aodh-api"
-"rhosp-rhel8/openstack-aodh-base" = "registry.redhat.io/rhosp-rhel8/openstack-aodh-base"
-"rhosp-rhel8/openstack-aodh-evaluator" = "registry.redhat.io/rhosp-rhel8/openstack-aodh-evaluator"
-"rhosp-rhel8/openstack-aodh-listener" = "registry.redhat.io/rhosp-rhel8/openstack-aodh-listener"
-"rhosp-rhel8/openstack-aodh-notifier" = "registry.redhat.io/rhosp-rhel8/openstack-aodh-notifier"
-"rhosp-rhel8/openstack-barbican-api" = "registry.redhat.io/rhosp-rhel8/openstack-barbican-api"
-"rhosp-rhel8/openstack-barbican-base" = "registry.redhat.io/rhosp-rhel8/openstack-barbican-base"
-"rhosp-rhel8/openstack-barbican-keystone-listener" = "registry.redhat.io/rhosp-rhel8/openstack-barbican-keystone-listener"
-"rhosp-rhel8/openstack-barbican-worker" = "registry.redhat.io/rhosp-rhel8/openstack-barbican-worker"
-"rhosp-rhel8/openstack-base" = "registry.redhat.io/rhosp-rhel8/openstack-base"
-"rhosp-rhel8/openstack-ceilometer-base" = "registry.redhat.io/rhosp-rhel8/openstack-ceilometer-base"
-"rhosp-rhel8/openstack-ceilometer-central" = "registry.redhat.io/rhosp-rhel8/openstack-ceilometer-central"
-"rhosp-rhel8/openstack-ceilometer-compute" = "registry.redhat.io/rhosp-rhel8/openstack-ceilometer-compute"
-"rhosp-rhel8/openstack-ceilometer-ipmi" = "registry.redhat.io/rhosp-rhel8/openstack-ceilometer-ipmi"
-"rhosp-rhel8/openstack-ceilometer-notification" = "registry.redhat.io/rhosp-rhel8/openstack-ceilometer-notification"
-"rhosp-rhel8/openstack-cinder-api" = "registry.redhat.io/rhosp-rhel8/openstack-cinder-api"
-"rhosp-rhel8/openstack-cinder-backup" = "registry.redhat.io/rhosp-rhel8/openstack-cinder-backup"
-"rhosp-rhel8/openstack-cinder-base" = "registry.redhat.io/rhosp-rhel8/openstack-cinder-base"
-"rhosp-rhel8/openstack-cinder-scheduler" = "registry.redhat.io/rhosp-rhel8/openstack-cinder-scheduler"
-"rhosp-rhel8/openstack-cinder-volume" = "registry.redhat.io/rhosp-rhel8/openstack-cinder-volume"
-"rhosp-rhel8/openstack-collectd" = "registry.redhat.io/rhosp-rhel8/openstack-collectd"
-"rhosp-rhel8/openstack-cron" = "registry.redhat.io/rhosp-rhel8/openstack-cron"
-"rhosp-rhel8/openstack-dependencies" = "registry.redhat.io/rhosp-rhel8/openstack-dependencies"
-"rhosp-rhel8/openstack-ec2-api" = "registry.redhat.io/rhosp-rhel8/openstack-ec2-api"
-"rhosp-rhel8/openstack-etcd" = "registry.redhat.io/rhosp-rhel8/openstack-etcd"
-"rhosp-rhel8/openstack-glance-api" = "registry.redhat.io/rhosp-rhel8/openstack-glance-api"
-"rhosp-rhel8/openstack-glance-base" = "registry.redhat.io/rhosp-rhel8/openstack-glance-base"
-"rhosp-rhel8/openstack-gnocchi-api" = "registry.redhat.io/rhosp-rhel8/openstack-gnocchi-api"
-"rhosp-rhel8/openstack-gnocchi-base" = "registry.redhat.io/rhosp-rhel8/openstack-gnocchi-base"
-"rhosp-rhel8/openstack-gnocchi-metricd" = "registry.redhat.io/rhosp-rhel8/openstack-gnocchi-metricd"
-"rhosp-rhel8/openstack-gnocchi-statsd" = "registry.redhat.io/rhosp-rhel8/openstack-gnocchi-statsd"
-"rhosp-rhel8/openstack-haproxy" = "registry.redhat.io/rhosp-rhel8/openstack-haproxy"
-"rhosp-rhel8/openstack-heat-all" = "registry.redhat.io/rhosp-rhel8/openstack-heat-all"
-"rhosp-rhel8/openstack-heat-api-cfn" = "registry.redhat.io/rhosp-rhel8/openstack-heat-api-cfn"
-"rhosp-rhel8/openstack-heat-api" = "registry.redhat.io/rhosp-rhel8/openstack-heat-api"
-"rhosp-rhel8/openstack-heat-base" = "registry.redhat.io/rhosp-rhel8/openstack-heat-base"
-"rhosp-rhel8/openstack-heat-engine" = "registry.redhat.io/rhosp-rhel8/openstack-heat-engine"
-"rhosp-rhel8/openstack-horizon" = "registry.redhat.io/rhosp-rhel8/openstack-horizon"
-"rhosp-rhel8/openstack-ironic-api" = "registry.redhat.io/rhosp-rhel8/openstack-ironic-api"
-"rhosp-rhel8/openstack-ironic-base" = "registry.redhat.io/rhosp-rhel8/openstack-ironic-base"
-"rhosp-rhel8/openstack-ironic-conductor" = "registry.redhat.io/rhosp-rhel8/openstack-ironic-conductor"
-"rhosp-rhel8/openstack-ironic-inspector" = "registry.redhat.io/rhosp-rhel8/openstack-ironic-inspector"
-"rhosp-rhel8/openstack-ironic-neutron-agent" = "registry.redhat.io/rhosp-rhel8/openstack-ironic-neutron-agent"
-"rhosp-rhel8/openstack-ironic-pxe" = "registry.redhat.io/rhosp-rhel8/openstack-ironic-pxe"
-"rhosp-rhel8/openstack-iscsid" = "registry.redhat.io/rhosp-rhel8/openstack-iscsid"
-"rhosp-rhel8/openstack-keepalived" = "registry.redhat.io/rhosp-rhel8/openstack-keepalived"
-"rhosp-rhel8/openstack-keystone-base" = "registry.redhat.io/rhosp-rhel8/openstack-keystone-base"
-"rhosp-rhel8/openstack-keystone" = "registry.redhat.io/rhosp-rhel8/openstack-keystone"
-"rhosp-rhel8/openstack-manila-api" = "registry.redhat.io/rhosp-rhel8/openstack-manila-api"
-"rhosp-rhel8/openstack-manila-base" = "registry.redhat.io/rhosp-rhel8/openstack-manila-base"
-"rhosp-rhel8/openstack-manila-scheduler" = "registry.redhat.io/rhosp-rhel8/openstack-manila-scheduler"
-"rhosp-rhel8/openstack-manila-share" = "registry.redhat.io/rhosp-rhel8/openstack-manila-share"
-"rhosp-rhel8/openstack-mariadb" = "registry.redhat.io/rhosp-rhel8/openstack-mariadb"
-"rhosp-rhel8/openstack-memcached" = "registry.redhat.io/rhosp-rhel8/openstack-memcached"
-"rhosp-rhel8/openstack-mistral-api" = "registry.redhat.io/rhosp-rhel8/openstack-mistral-api"
-"rhosp-rhel8/openstack-mistral-base" = "registry.redhat.io/rhosp-rhel8/openstack-mistral-base"
-"rhosp-rhel8/openstack-mistral-engine" = "registry.redhat.io/rhosp-rhel8/openstack-mistral-engine"
-"rhosp-rhel8/openstack-mistral-event-engine" = "registry.redhat.io/rhosp-rhel8/openstack-mistral-event-engine"
-"rhosp-rhel8/openstack-mistral-executor" = "registry.redhat.io/rhosp-rhel8/openstack-mistral-executor"
-"rhosp-rhel8/openstack-multipathd" = "registry.redhat.io/rhosp-rhel8/openstack-multipathd"
-"rhosp-rhel8/openstack-neutron-base" = "registry.redhat.io/rhosp-rhel8/openstack-neutron-base"
-"rhosp-rhel8/openstack-neutron-dhcp-agent" = "registry.redhat.io/rhosp-rhel8/openstack-neutron-dhcp-agent"
-"rhosp-rhel8/openstack-neutron-l3-agent" = "registry.redhat.io/rhosp-rhel8/openstack-neutron-l3-agent"
-"rhosp-rhel8/openstack-neutron-metadata-agent-ovn" = "registry.redhat.io/rhosp-rhel8/openstack-neutron-metadata-agent-ovn"
-"rhosp-rhel8/openstack-neutron-metadata-agent" = "registry.redhat.io/rhosp-rhel8/openstack-neutron-metadata-agent"
-"rhosp-rhel8/openstack-neutron-openvswitch-agent" = "registry.redhat.io/rhosp-rhel8/openstack-neutron-openvswitch-agent"
-"rhosp-rhel8/openstack-neutron-server-ovn" = "registry.redhat.io/rhosp-rhel8/openstack-neutron-server-ovn"
-"rhosp-rhel8/openstack-neutron-server" = "registry.redhat.io/rhosp-rhel8/openstack-neutron-server"
-"rhosp-rhel8/openstack-neutron-sriov-agent" = "registry.redhat.io/rhosp-rhel8/openstack-neutron-sriov-agent"
-"rhosp-rhel8/openstack-nova-api" = "registry.redhat.io/rhosp-rhel8/openstack-nova-api"
-"rhosp-rhel8/openstack-nova-base" = "registry.redhat.io/rhosp-rhel8/openstack-nova-base"
-"rhosp-rhel8/openstack-nova-compute-ironic" = "registry.redhat.io/rhosp-rhel8/openstack-nova-compute-ironic"
-"rhosp-rhel8/openstack-nova-compute" = "registry.redhat.io/rhosp-rhel8/openstack-nova-compute"
-"rhosp-rhel8/openstack-nova-conductor" = "registry.redhat.io/rhosp-rhel8/openstack-nova-conductor"
-"rhosp-rhel8/openstack-novajoin-base" = "registry.redhat.io/rhosp-rhel8/openstack-novajoin-base"
-"rhosp-rhel8/openstack-novajoin-notifier" = "registry.redhat.io/rhosp-rhel8/openstack-novajoin-notifier"
-"rhosp-rhel8/openstack-novajoin-server" = "registry.redhat.io/rhosp-rhel8/openstack-novajoin-server"
-"rhosp-rhel8/openstack-nova-libvirt" = "registry.redhat.io/rhosp-rhel8/openstack-nova-libvirt"
-"rhosp-rhel8/openstack-nova-novncproxy" = "registry.redhat.io/rhosp-rhel8/openstack-nova-novncproxy"
-"rhosp-rhel8/openstack-nova-scheduler" = "registry.redhat.io/rhosp-rhel8/openstack-nova-scheduler"
-"rhosp-rhel8/openstack-octavia-api" = "registry.redhat.io/rhosp-rhel8/openstack-octavia-api"
-"rhosp-rhel8/openstack-octavia-base" = "registry.redhat.io/rhosp-rhel8/openstack-octavia-base"
-"rhosp-rhel8/openstack-octavia-health-manager" = "registry.redhat.io/rhosp-rhel8/openstack-octavia-health-manager"
-"rhosp-rhel8/openstack-octavia-housekeeping" = "registry.redhat.io/rhosp-rhel8/openstack-octavia-housekeeping"
-"rhosp-rhel8/openstack-octavia-worker" = "registry.redhat.io/rhosp-rhel8/openstack-octavia-worker"
-"rhosp-rhel8/openstack-openvswitch-base" = "registry.redhat.io/rhosp-rhel8/openstack-openvswitch-base"
-"rhosp-rhel8/openstack-ovn-base" = "registry.redhat.io/rhosp-rhel8/openstack-ovn-base"
-"rhosp-rhel8/openstack-ovn-controller" = "registry.redhat.io/rhosp-rhel8/openstack-ovn-controller"
-"rhosp-rhel8/openstack-ovn-nb-db-server" = "registry.redhat.io/rhosp-rhel8/openstack-ovn-nb-db-server"
-"rhosp-rhel8/openstack-ovn-northd" = "registry.redhat.io/rhosp-rhel8/openstack-ovn-northd"
-"rhosp-rhel8/openstack-ovn-sb-db-server" = "registry.redhat.io/rhosp-rhel8/openstack-ovn-sb-db-server"
-"rhosp-rhel8/openstack-panko-api" = "registry.redhat.io/rhosp-rhel8/openstack-panko-api"
-"rhosp-rhel8/openstack-panko-base" = "registry.redhat.io/rhosp-rhel8/openstack-panko-base"
-"rhosp-rhel8/openstack-placement-api" = "registry.redhat.io/rhosp-rhel8/openstack-placement-api"
-"rhosp-rhel8/openstack-placement-base" = "registry.redhat.io/rhosp-rhel8/openstack-placement-base"
-"rhosp-rhel8/openstack-qdrouterd" = "registry.redhat.io/rhosp-rhel8/openstack-qdrouterd"
-"rhosp-rhel8/openstack-rabbitmq" = "registry.redhat.io/rhosp-rhel8/openstack-rabbitmq"
-"rhosp-rhel8/openstack-redis-base" = "registry.redhat.io/rhosp-rhel8/openstack-redis-base"
-"rhosp-rhel8/openstack-redis" = "registry.redhat.io/rhosp-rhel8/openstack-redis"
-"rhosp-rhel8/openstack-rsyslog-base" = "registry.redhat.io/rhosp-rhel8/openstack-rsyslog-base"
-"rhosp-rhel8/openstack-rsyslog" = "registry.redhat.io/rhosp-rhel8/openstack-rsyslog"
-"rhosp-rhel8/openstack-swift-account" = "registry.redhat.io/rhosp-rhel8/openstack-swift-account"
-"rhosp-rhel8/openstack-swift-base" = "registry.redhat.io/rhosp-rhel8/openstack-swift-base"
-"rhosp-rhel8/openstack-swift-container" = "registry.redhat.io/rhosp-rhel8/openstack-swift-container"
-"rhosp-rhel8/openstack-swift-object" = "registry.redhat.io/rhosp-rhel8/openstack-swift-object"
-"rhosp-rhel8/openstack-swift-proxy-server" = "registry.redhat.io/rhosp-rhel8/openstack-swift-proxy-server"
-"rhosp-rhel8/openstack-tempest" = "registry.redhat.io/rhosp-rhel8/openstack-tempest"
-"rhosp-rhel8/openstack-zaqar-base" = "registry.redhat.io/rhosp-rhel8/openstack-zaqar-base"
-"rhosp-rhel8/openstack-zaqar-wsgi" = "registry.redhat.io/rhosp-rhel8/openstack-zaqar-wsgi"
-"rhpam-7/rhpam75-businesscentral-monitoring-openshift-rhel8" = "registry.redhat.io/rhpam-7/rhpam75-businesscentral-monitoring-openshift-rhel8"
 "rhpam-7/rhpam-businesscentral-monitoring-rhel8" = "registry.redhat.io/rhpam-7/rhpam-businesscentral-monitoring-rhel8"
 "rhpam-7/rhpam-businesscentral-rhel8" = "registry.redhat.io/rhpam-7/rhpam-businesscentral-rhel8"
 "rhpam-7/rhpam-controller-rhel8" = "registry.redhat.io/rhpam-7/rhpam-controller-rhel8"
 "rhpam-7/rhpam-dashbuilder-rhel8" = "registry.redhat.io/rhpam-7/rhpam-dashbuilder-rhel8"
 "rhpam-7/rhpam-kieserver-rhel8" = "registry.redhat.io/rhpam-7/rhpam-kieserver-rhel8"
 "rhpam-7/rhpam-kogito-builder-rhel8" = "registry.redhat.io/rhpam-7/rhpam-kogito-builder-rhel8"
-"rhpam-7/rhpam-kogito-rhel8-operator-bundle" = "registry.redhat.io/rhpam-7/rhpam-kogito-rhel8-operator-bundle"
 "rhpam-7/rhpam-kogito-rhel8-operator" = "registry.redhat.io/rhpam-7/rhpam-kogito-rhel8-operator"
+"rhpam-7/rhpam-kogito-rhel8-operator-bundle" = "registry.redhat.io/rhpam-7/rhpam-kogito-rhel8-operator-bundle"
 "rhpam-7/rhpam-kogito-runtime-jvm-rhel8" = "registry.redhat.io/rhpam-7/rhpam-kogito-runtime-jvm-rhel8"
 "rhpam-7/rhpam-operator-bundle" = "registry.redhat.io/rhpam-7/rhpam-operator-bundle"
 "rhpam-7/rhpam-process-migration-rhel8" = "registry.redhat.io/rhpam-7/rhpam-process-migration-rhel8"
 "rhpam-7/rhpam-rhel8-operator" = "registry.redhat.io/rhpam-7/rhpam-rhel8-operator"
 "rhpam-7/rhpam-smartrouter-rhel8" = "registry.redhat.io/rhpam-7/rhpam-smartrouter-rhel8"
+"rhpam-7/rhpam75-businesscentral-monitoring-openshift-rhel8" = "registry.redhat.io/rhpam-7/rhpam75-businesscentral-monitoring-openshift-rhel8"
 "rhscl/devtoolset-10-perftools-rhel7" = "registry.redhat.io/rhscl/devtoolset-10-perftools-rhel7"
 "rhscl/devtoolset-10-toolchain-rhel7" = "registry.redhat.io/rhscl/devtoolset-10-toolchain-rhel7"
 "rhscl/go-toolset-7-rhel7" = "registry.access.redhat.com/rhscl/go-toolset-7-rhel7"
@@ -1478,15 +1480,13 @@
 "rhscl/s2i-base-rhel7" = "registry.access.redhat.com/rhscl/s2i-base-rhel7"
 "rhscl/s2i-core-rhel7" = "registry.access.redhat.com/rhscl/s2i-core-rhel7"
 "rhscl/varnish-6-rhel7" = "registry.access.redhat.com/rhscl/varnish-6-rhel7"
-"rh-sso-7/sso74-openj9-openshift-rhel8" = "registry.redhat.io/rh-sso-7/sso74-openj9-openshift-rhel8"
-"rh-sso-7/sso74-openshift-rhel8" = "registry.redhat.io/rh-sso-7/sso74-openshift-rhel8"
 "runai/runai-operator" = "registry.connect.redhat.com/runai/runai-operator"
 "seldonio/seldon-core-operator" = "registry.connect.redhat.com/seldonio/seldon-core-operator"
-"seldonio/seldon-engine-0-4-0" = "registry.connect.redhat.com/seldonio/seldon-engine-0-4-0"
 "seldonio/seldon-engine" = "registry.connect.redhat.com/seldonio/seldon-engine"
+"seldonio/seldon-engine-0-4-0" = "registry.connect.redhat.com/seldonio/seldon-engine-0-4-0"
 "seldonio/seldon-operator-0-4-0" = "registry.redhat.io/seldonio/seldon-operator-0-4-0"
 "sematext/sematext-agent-docker" = "registry.connect.redhat.com/sematext/sematext-agent-docker"
-"sematext/sematext-operator-bundle" = "registry.connect.redhat.com/sematext/sematext-operator-bundle"
+"sematext/sematext-operator-bundle" = "registry.redhat.io/sematext/sematext-operator-bundle"
 "sixfusion/openshift-collector" = "registry.connect.redhat.com/sixfusion/openshift-collector"
 "sso-7/sso73-openj9-openshift-rhel7" = "registry.redhat.io/sso-7/sso73-openj9-openshift-rhel7"
 "stackrox/main" = "registry.redhat.io/stackrox/main"
@@ -1498,13 +1498,13 @@
 "stf/sg-core-rhel8" = "registry.redhat.io/stf/sg-core-rhel8"
 "stf/smart-gateway-operator-bundle" = "registry.redhat.io/stf/smart-gateway-operator-bundle"
 "stf/smart-gateway-rhel7-operator" = "registry.redhat.io/stf/smart-gateway-rhel7-operator"
-"stf/smart-gateway-rhel8-operator" = "registry.redhat.io/stf/smart-gateway-rhel8-operator"
 "stf/smart-gateway-rhel8" = "registry.redhat.io/stf/smart-gateway-rhel8"
+"stf/smart-gateway-rhel8-operator" = "registry.redhat.io/stf/smart-gateway-rhel8-operator"
 "storageos/cluster-operator2-bundle" = "registry.connect.redhat.com/storageos/cluster-operator2-bundle"
 "storageos/node-10tb" = "registry.connect.redhat.com/storageos/node-10tb"
 "storageos/node-1tb" = "registry.redhat.io/storageos/node-1tb"
-"tigera/operator-init" = "quay.io/tigera/operator-init"
 "tigera/operator" = "registry.redhat.io/tigera/operator"
+"tigera/operator-init" = "quay.io/tigera/operator-init"
 "trilio/admission-webhook" = "registry.connect.redhat.com/trilio/admission-webhook"
 "trilio/meta-processor" = "registry.connect.redhat.com/trilio/meta-processor"
 "trilio/trilio-admission-webhook" = "registry.connect.redhat.com/trilio/trilio-admission-webhook"
@@ -1512,31 +1512,37 @@
 "trilio/webhook-init" = "registry.connect.redhat.com/trilio/webhook-init"
 "turbonomic/arangodb" = "registry.connect.redhat.com/turbonomic/arangodb"
 "turbonomic/kubeturbo-operator-bundle" = "registry.redhat.io/turbonomic/kubeturbo-operator-bundle"
-"turbonomic/market-component" = "registry.redhat.io/turbonomic/market-component"
 "turbonomic/market" = "registry.connect.redhat.com/turbonomic/market"
+"turbonomic/market-component" = "registry.redhat.io/turbonomic/market-component"
 "turbonomic/prometurbo" = "registry.redhat.io/turbonomic/prometurbo"
 "turbonomic/t8c-operator" = "registry.redhat.io/turbonomic/t8c-operator"
 "turbonomic/ui" = "registry.connect.redhat.com/turbonomic/ui"
 "twistlock/cloud-discovery" = "registry.redhat.io/twistlock/cloud-discovery"
 "twistlock/console-operator" = "registry.connect.redhat.com/twistlock/console-operator"
-"ubi7/go-toolset" = "registry.access.redhat.com/ubi7/go-toolset"
+"u/splunk/repository/docker/splunk/splunk" = "registry.connect.redhat.com/u/splunk/repository/docker/splunk/splunk"
+"u/stonebranch/repository/docker/stonebranch/image-ubi8-sb-6.6.0.1-linux-2.6-x86_64" = "registry.connect.redhat.com/u/stonebranch/repository/docker/stonebranch/image-ubi8-sb-6.6.0.1-linux-2.6-x86_64"
+"ubi7" = "registry.access.redhat.com/ubi7"
 "ubi7-init" = "registry.redhat.io/ubi7-init"
 "ubi7-minimal" = "registry.access.redhat.com/ubi7-minimal"
+"ubi7/go-toolset" = "registry.access.redhat.com/ubi7/go-toolset"
 "ubi7/nginx-118" = "registry.access.redhat.com/ubi7/nginx-118"
 "ubi7/nodejs-12" = "registry.access.redhat.com/ubi7/nodejs-12"
 "ubi7/nodejs-14" = "registry.access.redhat.com/ubi7/nodejs-14"
 "ubi7/php-73" = "registry.access.redhat.com/ubi7/php-73"
 "ubi7/python-27" = "registry.redhat.io/ubi7/python-27"
 "ubi7/python-38" = "registry.access.redhat.com/ubi7/python-38"
-"ubi7" = "registry.access.redhat.com/ubi7"
 "ubi7/ruby-26" = "registry.access.redhat.com/ubi7/ruby-26"
 "ubi7/ruby-27" = "registry.access.redhat.com/ubi7/ruby-27"
 "ubi7/ruby-30" = "registry.access.redhat.com/ubi7/ruby-30"
 "ubi7/s2i-base" = "registry.access.redhat.com/ubi7/s2i-base"
 "ubi7/s2i-core" = "registry.access.redhat.com/ubi7/s2i-core"
+"ubi7/ubi" = "registry.redhat.io/ubi7/ubi"
 "ubi7/ubi-init" = "registry.access.redhat.com/ubi7/ubi-init"
 "ubi7/ubi-minimal" = "registry.access.redhat.com/ubi7/ubi-minimal"
-"ubi7/ubi" = "registry.redhat.io/ubi7/ubi"
+"ubi8" = "registry.access.redhat.com/ubi8"
+"ubi8-init" = "registry.redhat.io/ubi8-init"
+"ubi8-micro" = "registry.access.redhat.com/ubi8-micro"
+"ubi8-minimal" = "registry.access.redhat.com/ubi8-minimal"
 "ubi8/buildah" = "registry.access.redhat.com/ubi8/buildah"
 "ubi8/dotnet-21" = "registry.access.redhat.com/ubi8/dotnet-21"
 "ubi8/dotnet-21-runtime" = "registry.access.redhat.com/ubi8/dotnet-21-runtime"
@@ -1546,17 +1552,14 @@
 "ubi8/dotnet-50-runtime" = "registry.access.redhat.com/ubi8/dotnet-50-runtime"
 "ubi8/go-toolset" = "registry.redhat.io/ubi8/go-toolset"
 "ubi8/httpd-24" = "registry.redhat.io/ubi8/httpd-24"
-"ubi8-init" = "registry.redhat.io/ubi8-init"
-"ubi8-micro" = "registry.access.redhat.com/ubi8-micro"
-"ubi8-minimal" = "registry.access.redhat.com/ubi8-minimal"
 "ubi8/nginx-118" = "registry.access.redhat.com/ubi8/nginx-118"
 "ubi8/nodejs-12" = "registry.access.redhat.com/ubi8/nodejs-12"
-"ubi8/nodejs-14-minimal" = "registry.access.redhat.com/ubi8/nodejs-14-minimal"
 "ubi8/nodejs-14" = "registry.access.redhat.com/ubi8/nodejs-14"
+"ubi8/nodejs-14-minimal" = "registry.access.redhat.com/ubi8/nodejs-14-minimal"
 "ubi8/openjdk-11" = "registry.access.redhat.com/ubi8/openjdk-11"
 "ubi8/openjdk-11-runtime" = "registry.redhat.io/ubi8/openjdk-11-runtime"
 "ubi8/openjdk-8" = "registry.access.redhat.com/ubi8/openjdk-8"
-"ubi8/openjdk-8-runtime" = "registry.redhat.io/ubi8/openjdk-8-runtime"
+"ubi8/openjdk-8-runtime" = "registry.access.redhat.com/ubi8/openjdk-8-runtime"
 "ubi8/pause" = "registry.access.redhat.com/ubi8/pause"
 "ubi8/perl-526" = "registry.access.redhat.com/ubi8/perl-526"
 "ubi8/perl-530" = "registry.access.redhat.com/ubi8/perl-530"
@@ -1566,35 +1569,32 @@
 "ubi8/python-36" = "registry.access.redhat.com/ubi8/python-36"
 "ubi8/python-38" = "registry.redhat.io/ubi8/python-38"
 "ubi8/python-39" = "registry.access.redhat.com/ubi8/python-39"
-"ubi8" = "registry.access.redhat.com/ubi8"
 "ubi8/ruby-25" = "registry.access.redhat.com/ubi8/ruby-25"
 "ubi8/ruby-26" = "registry.access.redhat.com/ubi8/ruby-26"
 "ubi8/ruby-27" = "registry.access.redhat.com/ubi8/ruby-27"
 "ubi8/s2i-base" = "registry.access.redhat.com/ubi8/s2i-base"
 "ubi8/s2i-core" = "registry.redhat.io/ubi8/s2i-core"
 "ubi8/skopeo" = "registry.access.redhat.com/ubi8/skopeo"
+"ubi8/ubi" = "registry.access.redhat.com/ubi8/ubi"
 "ubi8/ubi-init" = "registry.access.redhat.com/ubi8/ubi-init"
 "ubi8/ubi-micro" = "registry.access.redhat.com/ubi8/ubi-micro"
 "ubi8/ubi-minimal" = "registry.access.redhat.com/ubi8/ubi-minimal"
-"ubi8/ubi" = "registry.access.redhat.com/ubi8/ubi"
-"u/splunk/repository/docker/splunk/splunk" = "registry.connect.redhat.com/u/splunk/repository/docker/splunk/splunk"
-"u/stonebranch/repository/docker/stonebranch/image-ubi8-sb-6.6.0.1-linux-2.6-x86_64" = "registry.connect.redhat.com/u/stonebranch/repository/docker/stonebranch/image-ubi8-sb-6.6.0.1-linux-2.6-x86_64"
 "veritas/hyperscale" = "registry.connect.redhat.com/veritas/hyperscale"
 "veritas/hyperscale-verfs" = "registry.connect.redhat.com/veritas/hyperscale-verfs"
 "wavefronthq/proxy" = "registry.redhat.io/wavefronthq/proxy"
 "wavefronthq/wavefront-proxy" = "registry.redhat.io/wavefronthq/wavefront-proxy"
-"yugabytedb/yugabyte-platform-operator-image" = "registry.connect.redhat.com/yugabytedb/yugabyte-platform-operator-image"
 "yugabytedb/yugabyte-platform-operator" = "registry.connect.redhat.com/yugabytedb/yugabyte-platform-operator"
-"zabbix/zabbix-agent2-50" = "registry.connect.redhat.com/zabbix/zabbix-agent2-50"
+"yugabytedb/yugabyte-platform-operator-image" = "registry.connect.redhat.com/yugabytedb/yugabyte-platform-operator-image"
 "zabbix/zabbix-agent-50" = "registry.connect.redhat.com/zabbix/zabbix-agent-50"
+"zabbix/zabbix-agent2-50" = "registry.connect.redhat.com/zabbix/zabbix-agent2-50"
+"zabbix/zabbix-appliance" = "registry.connect.redhat.com/zabbix/zabbix-appliance"
 "zabbix/zabbix-appliance-40" = "registry.connect.redhat.com/zabbix/zabbix-appliance-40"
 "zabbix/zabbix-appliance-42" = "registry.redhat.io/zabbix/zabbix-appliance-42"
 "zabbix/zabbix-appliance-50" = "registry.connect.redhat.com/zabbix/zabbix-appliance-50"
-"zabbix/zabbix-appliance" = "registry.connect.redhat.com/zabbix/zabbix-appliance"
 "zabbix/zabbix-java-gateway-44" = "registry.connect.redhat.com/zabbix/zabbix-java-gateway-44"
 "zabbix/zabbix-java-gateway-50" = "registry.connect.redhat.com/zabbix/zabbix-java-gateway-50"
-"zabbix/zabbix-operator-certified-44" = "registry.connect.redhat.com/zabbix/zabbix-operator-certified-44"
 "zabbix/zabbix-operator-certified" = "registry.redhat.io/zabbix/zabbix-operator-certified"
+"zabbix/zabbix-operator-certified-44" = "registry.connect.redhat.com/zabbix/zabbix-operator-certified-44"
 "zabbix/zabbix-proxy-mysql-44" = "registry.connect.redhat.com/zabbix/zabbix-proxy-mysql-44"
 "zabbix/zabbix-proxy-mysql-50" = "registry.connect.redhat.com/zabbix/zabbix-proxy-mysql-50"
 "zabbix/zabbix-proxy-sqlite-50" = "registry.connect.redhat.com/zabbix/zabbix-proxy-sqlite-50"
diff --git a/SOURCES/002-rhel-shortnames-overrides.conf b/SOURCES/002-rhel-shortnames-overrides.conf
index fb06328..feb6551 100644
--- a/SOURCES/002-rhel-shortnames-overrides.conf
+++ b/SOURCES/002-rhel-shortnames-overrides.conf
@@ -1,10 +1,10 @@
 [aliases]
 "skopeo"  = "registry.access.redhat.com/ubi8/skopeo"
 "ubi8/skopeo" = "registry.access.redhat.com/ubi8/skopeo"
-"rhel8/skopeo" = "registry.redhat.io/rhel8/skopeo"
+"rhel9/skopeo" = "registry.redhat.io/rhel9/skopeo"
 "buildah" = "registry.access.redhat.com/ubi8/buildah"
 "ubi8/buildah" = "registry.access.redhat.com/ubi8/buildah"
-"rhel8/buildah" = "registry.redhat.io/rhel8/buildah"
+"rhel9/buildah" = "registry.redhat.io/rhel9/buildah"
 "podman" = "registry.access.redhat.com/ubi8/podman"
 "ubi8/podman" = "registry.access.redhat.com/ubi8/podman"
-"rhel8/podman" = "registry.redhat.io/rhel8/podman"
+"rhel9/podman" = "registry.redhat.io/rhel9/podman"
diff --git a/SOURCES/containers.conf b/SOURCES/containers.conf
index 696c818..992e66f 100644
--- a/SOURCES/containers.conf
+++ b/SOURCES/containers.conf
@@ -62,7 +62,7 @@ default_capabilities = [
 
 # A list of sysctls to be set in containers by default,
 # specified as "name=value",
-# for example:"net.ipv4.ping_group_range = 0 0".
+# for example:"net.ipv4.ping_group_range=0 0".
 #
 default_sysctls = [
   "net.ipv4.ping_group_range=0 0",
@@ -263,7 +263,13 @@ default_sysctls = [
 
 # Path to directory where CNI plugin binaries are located.
 #
-#cni_plugin_dirs = ["/usr/libexec/cni"]
+#cni_plugin_dirs = [
+#  "/usr/local/libexec/cni",
+#  "/usr/libexec/cni",
+#  "/usr/local/lib/cni",
+#  "/usr/lib/cni",
+#  "/opt/cni/bin",
+#]
 
 # The network name of the default CNI network to attach pods to.
 #
@@ -337,6 +343,15 @@ default_sysctls = [
 #events_logger = "journald"
 events_logger = "file"
 
+# A is a list of directories which are used to search for helper binaries.
+#
+#helper_binaries_dir = [
+#  "/usr/local/libexec/podman",
+#  "/usr/local/lib/podman",
+#  "/usr/libexec/podman",
+#  "/usr/lib/podman",
+#]
+
 # Path to OCI hooks directories for automatically executed hooks.
 #
 #hooks_dir = [
@@ -384,6 +399,10 @@ infra_image = "registry.access.redhat.com/ubi8/pause"
 #
 #machine_enabled = false
 
+# The image used when creating a podman-machine VM.
+#
+#machine_image = "testing"
+
 # MultiImageArchive - if true, the container engine allows for storing archives
 # (e.g., of the docker-archive transport) with multiple images.  By default,
 # Podman creates single-image archives.
@@ -406,7 +425,7 @@ infra_image = "registry.access.redhat.com/ubi8/pause"
 # Default options to pass to the slirp4netns binary.
 # For example "allow_host_loopback=true"
 #
-#network_cmd_options = []
+#network_cmd_options = ["enable_ipv6=true",]
 
 # Whether to use chroot instead of pivot_root in the runtime
 #
@@ -436,15 +455,25 @@ runtime = "runc"
 # List of the OCI runtimes that support --format=json.  When json is supported
 # engine will use it for reporting nicer errors.
 #
-#runtime_supports_json = ["crun", "runc", "kata", "runsc"]
+#runtime_supports_json = ["crun", "runc", "kata", "runsc", "krun"]
 
 # List of the OCI runtimes that supports running containers with KVM Separation.
 #
-#runtime_supports_kvm = ["kata"]
+#runtime_supports_kvm = ["kata", "krun"]
 
 # List of the OCI runtimes that supports running containers without cgroups.
 #
-#runtime_supports_nocgroups = ["crun"]
+#runtime_supports_nocgroups = ["crun", "krun"]
+
+# Default location for storing temporary container image content.  Can be overridden with the TMPDIR environment
+# variable.  If you specify "storage", then the location of the
+# container/storage tmp directory will be used.
+# image_copy_tmp_dir="/var/tmp"
+
+# Number of seconds to wait without a connection
+# before the `podman system service` times out and exits
+#
+#service_timeout = 5
 
 # Directory for persistent engine files (database, etc)
 # By default, this will be configured relative to where the containers/storage
@@ -483,7 +512,7 @@ runtime = "runc"
 #
 #volume_path = "/var/lib/containers/storage/volumes"
 
-# Paths to look for a valid OCI runtime (crun, runc, kata, runsc, etc)
+# Paths to look for a valid OCI runtime (crun, runc, kata, runsc, krun, etc)
 [engine.runtimes]
 #crun = [
 #  "/usr/bin/crun",
@@ -526,6 +555,11 @@ runtime = "runc"
 #  "/run/current-system/sw/bin/runsc",
 #]
 
+#krun = [
+#  "/usr/bin/krun",
+#  "/usr/local/bin/krun",
+#]
+
 [engine.volume_plugins]
 #testplugin = "/run/podman/plugins/test.sock"
 
diff --git a/SOURCES/containers.conf.5.md b/SOURCES/containers.conf.5.md
index 14ac609..b7b606f 100644
--- a/SOURCES/containers.conf.5.md
+++ b/SOURCES/containers.conf.5.md
@@ -1,4 +1,4 @@
-% containers.conf(5) Container engine configuration file
+% containers.conf 5 Container engine configuration file
 
 # NAME
 containers.conf - The container engine configuration file specifies default
@@ -279,10 +279,21 @@ Options are:
 The `network` table contains settings pertaining to the management of CNI
 plugins.
 
-**cni_plugin_dirs**=["/opt/cni/bin/",]
+**cni_plugin_dirs**=[]
 
 List of paths to directories where CNI plugin binaries are located.
 
+The default list is:
+```
+cni_plugin_dirs = [
+  "/usr/local/libexec/cni",
+  "/usr/libexec/cni",
+  "/usr/local/lib/cni",
+  "/usr/lib/cni",
+  "/opt/cni/bin",
+]
+```
+
 **default_network**="podman"
 
 The network name of the default CNI network to attach pods to.
@@ -367,6 +378,29 @@ if you want to set environment variables for the container.
 Default method to use when logging events.
 Valid values: `file`, `journald`, and `none`.
 
+**helper_binaries_dir**=["/usr/libexec/podman", ...]
+
+A is a list of directories which are used to search for helper binaries.
+
+The default paths on Linux are:
+- `/usr/local/libexec/podman`
+- `/usr/local/lib/podman`
+- `/usr/libexec/podman`
+- `/usr/lib/podman`
+
+The default paths on macOS are:
+- `/usr/local/opt/podman/libexec`
+-	`/opt/homebrew/bin`
+-	`/opt/homebrew/opt/podman/libexec`
+- `/usr/local/bin`
+-	`/usr/local/libexec/podman`
+-	`/usr/local/lib/podman`
+-	`/usr/libexec/podman`
+-	`/usr/lib/podman`
+
+The default path on Windows is:
+- `C:\Program Files\RedHat\Podman`
+
 **hooks_dir**=["/etc/containers/oci/hooks.d", ...]
 
 Path to the OCI hooks directories for automatically executed hooks.
@@ -412,6 +446,11 @@ Indicates if Podman is running inside a VM via Podman Machine.
 Podman uses this value to do extra setup around networking from the
 container inside the VM to to host.
 
+**machine_image**="testing"
+
+Default image used when creating a new VM using `podman machine init`.
+Options: `testing`, `stable`, or a custom path or download URL to an image
+
 **multi_image_archive**=false
 
 Allows for creating archives (e.g., tarballs) with more than one image.  Some container engines, such as Podman, interpret additional arguments as tags for one image and hence do not store more than one image.  The default behavior can be altered with this option.
@@ -428,11 +467,23 @@ and pods are visible.
 
 Path to the slirp4netns binary.
 
-**network_cmd_options**=[]
+**network_cmd_options**=["enable_ipv6=true",]
 
 Default options to pass to the slirp4netns binary.
 
-Example "allow_host_loopback=true"
+Valid options values are:
+
+  - **allow_host_loopback=true|false**: Allow the slirp4netns to reach the host loopback IP (`10.0.2.2`, which is added to `/etc/hosts` as `host.containers.internal` for your convenience). Default is false.
+  - **mtu=MTU**: Specify the MTU to use for this network. (Default is `65520`).
+  - **cidr=CIDR**: Specify ip range to use for this network. (Default is `10.0.2.0/24`).
+  - **enable_ipv6=true|false**: Enable IPv6. Default is false. (Required for `outbound_addr6`).
+  - **outbound_addr=INTERFACE**: Specify the outbound interface slirp should bind to (ipv4 traffic only).
+  - **outbound_addr=IPv4**: Specify the outbound ipv4 address slirp should bind to.
+  - **outbound_addr6=INTERFACE**: Specify the outbound interface slirp should bind to (ipv6 traffic only).
+  - **outbound_addr6=IPv6**: Specify the outbound ipv6 address slirp should bind to.
+  - **port_handler=rootlesskit**: Use rootlesskit for port forwarding. Default.
+  Note: Rootlesskit changes the source IP address of incoming packets to a IP address in the container network namespace, usually `10.0.2.100`. If your application requires the real source IP address, e.g. web server logs, use the slirp4netns port handler. The rootlesskit port handler is also used for rootless containers when connected to user-defined networks.
+  - **port_handler=slirp4netns**: Use the slirp4netns port forwarding, it is slower than rootlesskit but preserves the correct source IP address. This port handler cannot be used for user-defined networks.
 
 **no_pivot_root**=false
 
@@ -463,18 +514,31 @@ Default OCI specific runtime in runtimes that will be used by default. Must
 refer to a member of the runtimes table. Default runtime will be searched for
 on the system using the priority: "crun", "runc", "kata".
 
-**runtime_supports_json**=["crun", "runc", "kata", "runsc"]
+**runtime_supports_json**=["crun", "runc", "kata", "runsc", "krun"]
 
 The list of the OCI runtimes that support `--format=json`.
 
-**runtime_supports_kvm**=["kata"]
+**runtime_supports_kvm**=["kata", "krun"]
 
 The list of OCI runtimes that support running containers with KVM separation.
 
-**runtime_supports_nocgroups**=["crun"]
+**runtime_supports_nocgroups**=["crun", "krun"]
 
 The list of OCI runtimes that support running containers without CGroups.
 
+**image_copy_tmp_dir**="/var/tmp"
+
+Default location for storing temporary container image content.  Can be
+overridden with the TMPDIR environment variable.  If you specify "storage", then
+the location of the container/storage tmp directory will be used. If set then it
+is the users responsibility to cleanup storage. Configure tmpfiles.d(5) to
+cleanup storage.
+
+**service_timeout**=**5**
+
+Number of seconds to wait without a connection  before the
+`podman system service` times out and exits
+
 **static_dir**="/var/lib/containers/storage/libpod"
 
 Directory for persistent libpod files (database, etc).
@@ -570,6 +634,6 @@ is used for the storage.conf file rather than the default.
 This is primarily used for testing.
 
 # SEE ALSO
-containers-storage.conf(5), containers-policy.json(5), containers-registries.conf(5)
+containers-storage.conf(5), containers-policy.json(5), containers-registries.conf(5), tmpfiles.d(5)
 
 [toml]: https://github.com/toml-lang/toml
diff --git a/SOURCES/seccomp.json b/SOURCES/seccomp.json
index 99d88e2..7f79d25 100644
--- a/SOURCES/seccomp.json
+++ b/SOURCES/seccomp.json
@@ -242,6 +242,7 @@
 				"madvise",
 				"mbind",
 				"memfd_create",
+				"memfd_secret",
 				"mincore",
 				"mkdir",
 				"mkdirat",
diff --git a/SOURCES/shortnames.conf b/SOURCES/shortnames.conf
index 28d22f1..0f6827c 100644
--- a/SOURCES/shortnames.conf
+++ b/SOURCES/shortnames.conf
@@ -61,5 +61,7 @@
   "busybox" = "docker.io/library/busybox"
   # php
   "php" = "docker.io/library/php"
-  #python
+  # python
   "python" = "docker.io/library/python"
+  # node
+  "node" = "docker.io/library/node"
diff --git a/SOURCES/update-vendored.sh b/SOURCES/update-vendored.sh
index 1c2beb7..e273ba9 100755
--- a/SOURCES/update-vendored.sh
+++ b/SOURCES/update-vendored.sh
@@ -3,20 +3,18 @@
 # for the c/storage, c/image and c/common vendored in podman, skopeo, buildah
 # For questions reach to Jindrich Novy <jnovy@redhat.com>
 rm -f /tmp/ver_image /tmp/ver_common /tmp/ver_storage
-B=`pkg switch-branch | grep ^* | cut -d\  -f2`
 CENTOS=""
 pwd | grep /tmp/centos > /dev/null
 if [ $? == 0 ]; then
   CENTOS=1
 fi
-set -xe
-echo $B
+set -e
 for P in podman skopeo buildah; do
   BRN=`pwd | sed 's,^.*/,,'`
   rm -rf $P
   pkg clone $P
   cd $P
-  [ -z "$CENTOS" ] && pkg switch-branch $B
+  [ -z "$CENTOS" ] && pkg switch-branch $BRN
   if [ $BRN != stream-container-tools-rhel8 ]; then
     pkg prep
   else
diff --git a/SPECS/containers-common.spec b/SPECS/containers-common.spec
index b57b36c..2d4eb79 100644
--- a/SPECS/containers-common.spec
+++ b/SPECS/containers-common.spec
@@ -3,17 +3,17 @@
 # These vendored components must have the same version. If it is not the case,
 # pick the oldest version on c/image, c/common, c/storage vendored in
 # podman/skopeo/podman.
-%global skopeo_branch release-1.4
-%global podman_branch v3.3
-%global image_branch v5.15.0
-%global common_branch v0.42.0
-%global storage_branch v1.33.1
+%global skopeo_branch main
+%global podman_branch main
+%global image_branch v5.16.0
+%global common_branch v0.45.0
+%global storage_branch v1.36.0
 %global shortnames_branch main
 
 Epoch: 2
 Name: containers-common
 Version: 1
-Release: 2%{?dist}
+Release: 4%{?dist}
 Summary: Common configuration and documentation for containers
 License: ASL 2.0
 BuildArch: noarch
@@ -161,6 +161,14 @@ EOF
 %{_datadir}/rhel/secrets/*
 
 %changelog
+* Fri Sep 24 2021 Jindrich Novy <jnovy@redhat.com> - 2:1-4
+- update to the new vendored components
+- Related: #2001445
+
+* Fri Sep 10 2021 Jindrich Novy <jnovy@redhat.com> - 2:1-3
+- update to the new vendored components
+- Related: #2001445
+
 * Wed Aug 11 2021 Jindrich Novy <jnovy@redhat.com> - 2:1-2
 - synchronize config files for RHEL-8.5
 - Related: #1934415