diff --git a/.containers-common.metadata b/.containers-common.metadata
index c1f0436..217235a 100644
--- a/.containers-common.metadata
+++ b/.containers-common.metadata
@@ -1,4 +1,4 @@
-5a594964d481c7bbcf748a43599391619866eebb SOURCES/aardvark-dns-v1.0.1-rhel-vendor.tar.gz
-5c8d24e57860e54bc0b02e5f70bf4ce861eeb247 SOURCES/netavark-v1.0.1-rhel-vendor.tar.gz
-8634b77bd1f0d5738a4e0e2b1ca0bf7c784afeb1 SOURCES/v1.0.1-rhel-0a8eabf.tar.gz
-d42da7797a651a93df43f8cfbaa42101660c1b62 SOURCES/v1.0.1-rhel-93af394.tar.gz
+92a2bbb50398d4326834e37c17d7ad0c2ed68e5f SOURCES/aardvark-dns-v1.0.3-a92337b.tar.gz
+c43b8b3548ebc251461f5667d01142e4491691a3 SOURCES/aardvark-dns-v1.0.3-vendor.tar.gz
+41313c08ae196941064c6b9c8a090be2381cce51 SOURCES/netavark-v1.0.3-ec7efb8.tar.gz
+26c57cd7077cd8088720082889e3f3c9d776e75c SOURCES/netavark-v1.0.3-vendor.tar.gz
diff --git a/.gitignore b/.gitignore
index f8ddae0..aa64eb1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-SOURCES/aardvark-dns-v1.0.1-rhel-vendor.tar.gz
-SOURCES/netavark-v1.0.1-rhel-vendor.tar.gz
-SOURCES/v1.0.1-rhel-0a8eabf.tar.gz
-SOURCES/v1.0.1-rhel-93af394.tar.gz
+SOURCES/aardvark-dns-v1.0.3-a92337b.tar.gz
+SOURCES/aardvark-dns-v1.0.3-vendor.tar.gz
+SOURCES/netavark-v1.0.3-ec7efb8.tar.gz
+SOURCES/netavark-v1.0.3-vendor.tar.gz
diff --git a/SOURCES/001-rhel-shortnames-pyxis.conf b/SOURCES/001-rhel-shortnames-pyxis.conf
index c4c9e6b..77669a4 100644
--- a/SOURCES/001-rhel-shortnames-pyxis.conf
+++ b/SOURCES/001-rhel-shortnames-pyxis.conf
@@ -11,7 +11,10 @@
 "3scale-amp2/system-rhel7" = "registry.redhat.io/3scale-amp2/system-rhel7"
 "3scale-amp2/toolbox-rhel8" = "registry.redhat.io/3scale-amp2/toolbox-rhel8"
 "3scale-amp2/zync-rhel8" = "registry.redhat.io/3scale-amp2/zync-rhel8"
-"5e8cf2fb69aea31642b1134b/network-operator" = "registry.redhat.io/5e8cf2fb69aea31642b1134b/network-operator"
+"3scale-mas/3scale-rhel7" = "registry.redhat.io/3scale-mas/3scale-rhel7"
+"5f7d444f29373868204229e0/corent-jtrac-application" = "registry.connect.redhat.com/5f7d444f29373868204229e0/corent-jtrac-application"
+"5f7d444f29373868204229e0/corent-jtrac-operator" = "registry.connect.redhat.com/5f7d444f29373868204229e0/corent-jtrac-operator"
+"61725cc480cc9b10e9278631/vsphere-kubernetes-drivers-operator" = "registry.redhat.io/61725cc480cc9b10e9278631/vsphere-kubernetes-drivers-operator"
 "6189855680cc9b10e93e68fe/headspin-operator" = "registry.connect.redhat.com/6189855680cc9b10e93e68fe/headspin-operator"
 "6189855680cc9b10e93e68fe/hspusher" = "registry.connect.redhat.com/6189855680cc9b10e93e68fe/hspusher"
 "61b0dd9a4841f1221d73cdba/splunk-operator" = "registry.connect.redhat.com/61b0dd9a4841f1221d73cdba/splunk-operator"
@@ -24,7 +27,10 @@
 "advanced-cluster-security/rhacs-rhel8-operator" = "registry.access.redhat.com/advanced-cluster-security/rhacs-rhel8-operator"
 "advanced-cluster-security/rhacs-roxctl-rhel8" = "registry.access.redhat.com/advanced-cluster-security/rhacs-roxctl-rhel8"
 "advanced-cluster-security/rhacs-scanner-db-rhel8" = "registry.access.redhat.com/advanced-cluster-security/rhacs-scanner-db-rhel8"
+"advanced-cluster-security/rhacs-scanner-db-slim-rhel8" = "registry.access.redhat.com/advanced-cluster-security/rhacs-scanner-db-slim-rhel8"
 "advanced-cluster-security/rhacs-scanner-rhel8" = "registry.access.redhat.com/advanced-cluster-security/rhacs-scanner-rhel8"
+"advanced-cluster-security/rhacs-scanner-slim-rhel8" = "registry.redhat.io/advanced-cluster-security/rhacs-scanner-slim-rhel8"
+"aerospike/aerospike-kubernetes-operator-bundle-rhmp" = "registry.connect.redhat.com/aerospike/aerospike-kubernetes-operator-bundle-rhmp"
 "aerospike/aerospike-kubernetes-operator" = "registry.connect.redhat.com/aerospike/aerospike-kubernetes-operator"
 "aerospike/aerospike-server-enterprise-ubi8" = "registry.connect.redhat.com/aerospike/aerospike-server-enterprise-ubi8"
 "agile-lab/wasp-consumers-batch" = "registry.connect.redhat.com/agile-lab/wasp-consumers-batch"
@@ -37,10 +43,10 @@
 "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"
-"amq7/amq-broker-init-openj9-11-rhel8" = "registry.redhat.io/amq7/amq-broker-init-openj9-11-rhel8"
+"amq7/amq-broker-init-openjdk-11-rhel8" = "registry.redhat.io/amq7/amq-broker-init-openjdk-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-openjdk-11-rhel8" = "registry.redhat.io/amq7/amq-broker-openjdk-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"
@@ -53,7 +59,7 @@
 "amq7/amq-interconnect" = "registry.access.redhat.com/amq7/amq-interconnect"
 "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"
+"amq7/amq-online-1-auth-plugin" = "registry.redhat.io/amq7/amq-online-1-auth-plugin"
 "amq7/amq-online-1-broker-plugin" = "registry.access.redhat.com/amq7/amq-online-1-broker-plugin"
 "amq7/amq-online-1-console-init" = "registry.redhat.io/amq7/amq-online-1-console-init"
 "amq7/amq-online-1-console-server-rhel7" = "registry.redhat.io/amq7/amq-online-1-console-server-rhel7"
@@ -67,8 +73,9 @@
 "amq7/amq-streams-drain-cleaner-rhel8" = "registry.redhat.io/amq7/amq-streams-drain-cleaner-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-28-rhel8" = "registry.redhat.io/amq7/amq-streams-kafka-28-rhel8"
+"amq7/amq-streams-kafka-27-rhel7" = "registry.redhat.io/amq7/amq-streams-kafka-27-rhel7"
 "amq7/amq-streams-kafka-30-rhel8" = "registry.redhat.io/amq7/amq-streams-kafka-30-rhel8"
+"amq7/amq-streams-kafka-31-rhel8" = "registry.redhat.io/amq7/amq-streams-kafka-31-rhel8"
 "amq7/amq-streams-operator-bundle" = "registry.redhat.io/amq7/amq-streams-operator-bundle"
 "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"
@@ -80,6 +87,7 @@
 "anchore/enterprise-operator" = "registry.connect.redhat.com/anchore/enterprise-operator"
 "anchore/enterprise" = "registry.connect.redhat.com/anchore/enterprise"
 "anchore/enterprise-ui" = "registry.connect.redhat.com/anchore/enterprise-ui"
+"ansible-automation-platform-20-early-access/aap-must-gather-rhel8" = "registry.redhat.io/ansible-automation-platform-20-early-access/aap-must-gather-rhel8"
 "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"
@@ -107,9 +115,27 @@
 "ansible-automation-platform-21/hub-web-rhel8" = "registry.redhat.io/ansible-automation-platform-21/hub-web-rhel8"
 "ansible-automation-platform-21/platform-resource-rhel8-operator" = "registry.redhat.io/ansible-automation-platform-21/platform-resource-rhel8-operator"
 "ansible-automation-platform-21/platform-resource-runner-rhel8" = "registry.redhat.io/ansible-automation-platform-21/platform-resource-runner-rhel8"
+"ansible-automation-platform-22/aap-must-gather-rhel8" = "registry.redhat.io/ansible-automation-platform-22/aap-must-gather-rhel8"
+"ansible-automation-platform-22/ansible-builder-rhel8" = "registry.redhat.io/ansible-automation-platform-22/ansible-builder-rhel8"
+"ansible-automation-platform-22/ansible-python-base-rhel8" = "registry.redhat.io/ansible-automation-platform-22/ansible-python-base-rhel8"
+"ansible-automation-platform-22/ansible-python-toolkit-rhel8" = "registry.redhat.io/ansible-automation-platform-22/ansible-python-toolkit-rhel8"
+"ansible-automation-platform-22/controller-rhel8-operator" = "registry.redhat.io/ansible-automation-platform-22/controller-rhel8-operator"
+"ansible-automation-platform-22/controller-rhel8" = "registry.redhat.io/ansible-automation-platform-22/controller-rhel8"
+"ansible-automation-platform-22/ee-29-rhel8" = "registry.redhat.io/ansible-automation-platform-22/ee-29-rhel8"
+"ansible-automation-platform-22/ee-minimal-rhel8" = "registry.redhat.io/ansible-automation-platform-22/ee-minimal-rhel8"
+"ansible-automation-platform-22/ee-supported-rhel8" = "registry.redhat.io/ansible-automation-platform-22/ee-supported-rhel8"
+"ansible-automation-platform-22/hub-rhel8-operator" = "registry.redhat.io/ansible-automation-platform-22/hub-rhel8-operator"
+"ansible-automation-platform-22/hub-rhel8" = "registry.redhat.io/ansible-automation-platform-22/hub-rhel8"
+"ansible-automation-platform-22/hub-web-rhel8" = "registry.redhat.io/ansible-automation-platform-22/hub-web-rhel8"
+"ansible-automation-platform-22/platform-resource-rhel8-operator" = "registry.redhat.io/ansible-automation-platform-22/platform-resource-rhel8-operator"
+"ansible-automation-platform-22/platform-resource-runner-rhel8" = "registry.redhat.io/ansible-automation-platform-22/platform-resource-runner-rhel8"
+"ansible-automation-platform/cloud-addons-operator-bundle" = "registry.redhat.io/ansible-automation-platform/cloud-addons-operator-bundle"
 "ansible-automation-platform/platform-operator-bundle" = "registry.redhat.io/ansible-automation-platform/platform-operator-bundle"
 "ansible-tower-38/ansible-runner-rhel7" = "registry.redhat.io/ansible-tower-38/ansible-runner-rhel7"
 "ansible-tower-38/ansible-tower-rhel7" = "registry.redhat.io/ansible-tower-38/ansible-tower-rhel7"
+"apimatic/apimatic-codegen-operator-bundle" = "registry.redhat.io/apimatic/apimatic-codegen-operator-bundle"
+"apimatic/apimatic-codegen-operator-ubi8" = "registry.connect.redhat.com/apimatic/apimatic-codegen-operator-ubi8"
+"apimatic/apimatic-codegen-ubi8" = "registry.connect.redhat.com/apimatic/apimatic-codegen-ubi8"
 "aporeto/enforcerd" = "registry.connect.redhat.com/aporeto/enforcerd"
 "appdynamics/cluster-agent-operator-bundle" = "registry.connect.redhat.com/appdynamics/cluster-agent-operator-bundle"
 "appdynamics/cluster-agent-operator" = "registry.redhat.io/appdynamics/cluster-agent-operator"
@@ -118,6 +144,11 @@
 "appdynamics/machine-agent-analytics" = "registry.connect.redhat.com/appdynamics/machine-agent-analytics"
 "appdynamics/machine-agent-netviz" = "registry.connect.redhat.com/appdynamics/machine-agent-netviz"
 "appdynamics/nodejs-agent-operator" = "registry.connect.redhat.com/appdynamics/nodejs-agent-operator"
+"application-interconnect/skupper-config-sync-rhel8" = "registry.redhat.io/application-interconnect/skupper-config-sync-rhel8"
+"application-interconnect/skupper-operator-bundle" = "registry.redhat.io/application-interconnect/skupper-operator-bundle"
+"application-interconnect/skupper-router-rhel8" = "registry.redhat.io/application-interconnect/skupper-router-rhel8"
+"application-interconnect/skupper-service-controller-rhel8" = "registry.redhat.io/application-interconnect/skupper-service-controller-rhel8"
+"application-interconnect/skupper-site-controller-rhel8" = "registry.redhat.io/application-interconnect/skupper-site-controller-rhel8"
 "appranix/apx-controller" = "registry.redhat.io/appranix/apx-controller"
 "appranix/apx-manager" = "registry.connect.redhat.com/appranix/apx-manager"
 "appranix/apx-operator-bundle" = "registry.connect.redhat.com/appranix/apx-operator-bundle"
@@ -189,7 +220,6 @@
 "blackducksoftware/synopsys-operator-bundle" = "registry.connect.redhat.com/blackducksoftware/synopsys-operator-bundle"
 "blackducksoftware/synopsys-operator" = "registry.connect.redhat.com/blackducksoftware/synopsys-operator"
 "bleemeo/bleemeo-agent" = "registry.connect.redhat.com/bleemeo/bleemeo-agent"
-"bpm-test-registry-namespace/simple-demo-operator" = "registry.redhat.io/bpm-test-registry-namespace/simple-demo-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"
@@ -271,7 +301,11 @@
 "carbonetes/operator" = "registry.redhat.io/carbonetes/operator"
 "catalogicsoftware/cloudcasa-amds-kagent" = "registry.connect.redhat.com/catalogicsoftware/cloudcasa-amds-kagent"
 "catalogicsoftware/cloudcasa-bundle" = "registry.connect.redhat.com/catalogicsoftware/cloudcasa-bundle"
+"catalogicsoftware/cloudcasa-kube-bench" = "registry.connect.redhat.com/catalogicsoftware/cloudcasa-kube-bench"
+"catalogicsoftware/cloudcasa-kube-hunter" = "registry.connect.redhat.com/catalogicsoftware/cloudcasa-kube-hunter"
 "catalogicsoftware/cloudcasa-operator" = "registry.connect.redhat.com/catalogicsoftware/cloudcasa-operator"
+"catalogicsoftware/cloudcasa-polaris" = "registry.connect.redhat.com/catalogicsoftware/cloudcasa-polaris"
+"catalogicsoftware/cloudcasa-trivy" = "registry.connect.redhat.com/catalogicsoftware/cloudcasa-trivy"
 "catalogicsoftware/cloudcasa-velero-plugin-for-aws" = "registry.connect.redhat.com/catalogicsoftware/cloudcasa-velero-plugin-for-aws"
 "catalogicsoftware/cloudcasa-velero-plugin-for-csi" = "registry.connect.redhat.com/catalogicsoftware/cloudcasa-velero-plugin-for-csi"
 "catalogicsoftware/cloudcasa-velero-plugin-for-microsoft-azure" = "registry.connect.redhat.com/catalogicsoftware/cloudcasa-velero-plugin-for-microsoft-azure"
@@ -280,6 +314,7 @@
 "ca/uma-operator-bundle" = "registry.connect.redhat.com/ca/uma-operator-bundle"
 "cdk_beta/atomicapp" = "registry.access.redhat.com/cdk_beta/atomicapp"
 "cdmtech-inc/demo-app-fe" = "registry.redhat.io/cdmtech-inc/demo-app-fe"
+"checkmarx/kics" = "registry.connect.redhat.com/checkmarx/kics"
 "cisco/cisco-vts262-ga" = "registry.connect.redhat.com/cisco/cisco-vts262-ga"
 "citrix/citrix-adc-istio-ingress-gateway" = "registry.connect.redhat.com/citrix/citrix-adc-istio-ingress-gateway"
 "citrix/citrix-adc-metrics-exporter" = "registry.connect.redhat.com/citrix/citrix-adc-metrics-exporter"
@@ -289,8 +324,8 @@
 "citrix/citrix-cpx-istio-sidecar-injector" = "registry.connect.redhat.com/citrix/citrix-cpx-istio-sidecar-injector"
 "citrix/citrix-ingress-controller" = "registry.connect.redhat.com/citrix/citrix-ingress-controller"
 "citrix/citrix-k8s-cpx-ingress-bundle" = "registry.connect.redhat.com/citrix/citrix-k8s-cpx-ingress-bundle"
-"citrix/citrix-k8s-cpx-ingress-controller" = "registry.connect.redhat.com/citrix/citrix-k8s-cpx-ingress-controller"
-"citrix/citrix-k8s-ingress-bundle" = "registry.connect.redhat.com/citrix/citrix-k8s-ingress-bundle"
+"citrix/citrix-k8s-cpx-ingress-controller" = "registry.redhat.io/citrix/citrix-k8s-cpx-ingress-controller"
+"citrix/citrix-k8s-ingress-bundle" = "registry.redhat.io/citrix/citrix-k8s-ingress-bundle"
 "citrix/citrix-k8s-ingress-controller" = "registry.redhat.io/citrix/citrix-k8s-ingress-controller"
 "citrix/istioingressgateway-bundle" = "registry.connect.redhat.com/citrix/istioingressgateway-bundle"
 "citrix/istioingressgateway" = "registry.connect.redhat.com/citrix/istioingressgateway"
@@ -354,9 +389,7 @@
 "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"
@@ -380,6 +413,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-csi-driver" = "registry.access.redhat.com/container-native-virtualization/hostpath-csi-driver"
+"container-native-virtualization/hostpath-csi-driver-rhel8" = "registry.access.redhat.com/container-native-virtualization/hostpath-csi-driver-rhel8"
 "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/hyperconverged-cluster-operator" = "registry.redhat.io/container-native-virtualization/hyperconverged-cluster-operator"
@@ -389,7 +424,6 @@
 "container-native-virtualization/kubevirt-cpu-model-nfd-plugin" = "registry.redhat.io/container-native-virtualization/kubevirt-cpu-model-nfd-plugin"
 "container-native-virtualization/kubevirt-cpu-node-labeller" = "registry.redhat.io/container-native-virtualization/kubevirt-cpu-node-labeller"
 "container-native-virtualization/kubevirt-kvm-info-nfd-plugin" = "registry.access.redhat.com/container-native-virtualization/kubevirt-kvm-info-nfd-plugin"
-"container-native-virtualization/kubevirt-metrics-collector" = "registry.redhat.io/container-native-virtualization/kubevirt-metrics-collector"
 "container-native-virtualization/kubevirt-ssp-operator" = "registry.redhat.io/container-native-virtualization/kubevirt-ssp-operator"
 "container-native-virtualization/kubevirt-tekton-rhel8" = "registry.redhat.io/container-native-virtualization/kubevirt-tekton-rhel8"
 "container-native-virtualization/kubevirt-template-validator" = "registry.redhat.io/container-native-virtualization/kubevirt-template-validator"
@@ -427,8 +461,6 @@
 "coralogix/coralogix-fluentd" = "registry.connect.redhat.com/coralogix/coralogix-fluentd"
 "coralogix/coralogix-operator-bundle" = "registry.connect.redhat.com/coralogix/coralogix-operator-bundle"
 "coralogix/coralogix-operator" = "registry.connect.redhat.com/coralogix/coralogix-operator"
-"corentrepo/corent-jtrac-application" = "registry.connect.redhat.com/corentrepo/corent-jtrac-application"
-"corentrepo/corent-jtrac-operator" = "registry.connect.redhat.com/corentrepo/corent-jtrac-operator"
 "corentrepo/corent-operator-bundle" = "registry.connect.redhat.com/corentrepo/corent-operator-bundle"
 "coscale/coscale-agent" = "registry.connect.redhat.com/coscale/coscale-agent"
 "costmanagement/costmanagement-metrics-operator-bundle" = "registry.redhat.io/costmanagement/costmanagement-metrics-operator-bundle"
@@ -437,6 +469,7 @@
 "couchbase/exporter" = "registry.connect.redhat.com/couchbase/exporter"
 "couchbase/fluent-bit" = "registry.redhat.io/couchbase/fluent-bit"
 "couchbase/operator-bundle" = "registry.connect.redhat.com/couchbase/operator-bundle"
+"couchbase/operator-certification" = "registry.connect.redhat.com/couchbase/operator-certification"
 "couchbase/operator" = "registry.connect.redhat.com/couchbase/operator"
 "couchbase/server" = "registry.connect.redhat.com/couchbase/server"
 "couchbase/sync-gateway" = "registry.connect.redhat.com/couchbase/sync-gateway"
@@ -473,6 +506,7 @@
 "crunchydata/pgo-rmdata" = "registry.connect.redhat.com/crunchydata/pgo-rmdata"
 "crunchydata/pgo-scheduler" = "registry.connect.redhat.com/crunchydata/pgo-scheduler"
 "crunchydata/pgo-sqlrunner" = "registry.connect.redhat.com/crunchydata/pgo-sqlrunner"
+"crunchydata/postgres-operator-bundle-marketplace" = "registry.connect.redhat.com/crunchydata/postgres-operator-bundle-marketplace"
 "crunchydata/postgres-operator-bundle" = "registry.connect.redhat.com/crunchydata/postgres-operator-bundle"
 "crunchydata/postgres-operator" = "registry.redhat.io/crunchydata/postgres-operator"
 "cyberark/conjur-nginx" = "registry.connect.redhat.com/cyberark/conjur-nginx"
@@ -482,7 +516,7 @@
 "cyberark/conjur-openshift-follower-info" = "registry.connect.redhat.com/cyberark/conjur-openshift-follower-info"
 "cyberark/conjur-openshift-follower-nginx" = "registry.connect.redhat.com/cyberark/conjur-openshift-follower-nginx"
 "cyberark/conjur-openshift-follower-operator-bundle" = "registry.redhat.io/cyberark/conjur-openshift-follower-operator-bundle"
-"cyberark/conjur-openshift-follower-operator" = "registry.redhat.io/cyberark/conjur-openshift-follower-operator"
+"cyberark/conjur-openshift-follower-operator" = "registry.connect.redhat.com/cyberark/conjur-openshift-follower-operator"
 "cyberark/conjur-openshift-follower-postgres" = "registry.connect.redhat.com/cyberark/conjur-openshift-follower-postgres"
 "cyberark/conjur-openshift-follower-syslog-ng" = "registry.connect.redhat.com/cyberark/conjur-openshift-follower-syslog-ng"
 "cyberark/conjur" = "registry.redhat.io/cyberark/conjur"
@@ -499,7 +533,6 @@
 "datacore-software/openstack-cinder-volume-datacore-rhosp-16-1" = "registry.connect.redhat.com/datacore-software/openstack-cinder-volume-datacore-rhosp-16-1"
 "datacore-software/openstack-cinder-volume-datacore-rhosp-16-2" = "registry.connect.redhat.com/datacore-software/openstack-cinder-volume-datacore-rhosp-16-2"
 "datadog/datadog-agent" = "registry.connect.redhat.com/datadog/datadog-agent"
-"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"
@@ -508,7 +541,7 @@
 "datastax/cass-operator-bundle" = "registry.connect.redhat.com/datastax/cass-operator-bundle"
 "datastax/cass-operator" = "registry.connect.redhat.com/datastax/cass-operator"
 "datastax/dse-server" = "registry.connect.redhat.com/datastax/dse-server"
-"datastax/system-logger" = "registry.redhat.io/datastax/system-logger"
+"datastax/system-logger" = "registry.connect.redhat.com/datastax/system-logger"
 "datera/rhosp13-openstack-cinder-volume-datera" = "registry.redhat.io/datera/rhosp13-openstack-cinder-volume-datera"
 "datera/rhosp16-openstack-cinder-volume-datera" = "registry.redhat.io/datera/rhosp16-openstack-cinder-volume-datera"
 "dell-emc/dell-csiop-bundle-110" = "registry.connect.redhat.com/dell-emc/dell-csiop-bundle-110"
@@ -526,19 +559,25 @@
 "dellemc/rhosp13-nova-compute-dellemc-vxflexos" = "registry.connect.redhat.com/dellemc/rhosp13-nova-compute-dellemc-vxflexos"
 "densify/container-data-collection-forwarder" = "registry.connect.redhat.com/densify/container-data-collection-forwarder"
 "densify/densify-operator-bundle" = "registry.connect.redhat.com/densify/densify-operator-bundle"
-"densify/densify-operator" = "registry.connect.redhat.com/densify/densify-operator"
+"densify/densify-operator" = "registry.redhat.io/densify/densify-operator"
 "deployhub/deployhub-pro" = "registry.connect.redhat.com/deployhub/deployhub-pro"
 "deployhub/deployhub" = "registry.connect.redhat.com/deployhub/deployhub"
+"devspaces/configbump-rhel8" = "registry.redhat.io/devspaces/configbump-rhel8"
+"devspaces/dashboard-rhel8" = "registry.redhat.io/devspaces/dashboard-rhel8"
+"devspaces/devfileregistry-rhel8" = "registry.redhat.io/devspaces/devfileregistry-rhel8"
+"devspaces/devspaces-operator-bundle" = "registry.redhat.io/devspaces/devspaces-operator-bundle"
+"devspaces/devspaces-rhel8-operator" = "registry.redhat.io/devspaces/devspaces-rhel8-operator"
+"devspaces/idea-rhel8" = "registry.redhat.io/devspaces/idea-rhel8"
+"devspaces/imagepuller-rhel8" = "registry.redhat.io/devspaces/imagepuller-rhel8"
+"devspaces/machineexec-rhel8" = "registry.redhat.io/devspaces/machineexec-rhel8"
+"devspaces/pluginregistry-rhel8" = "registry.redhat.io/devspaces/pluginregistry-rhel8"
+"devspaces/server-rhel8" = "registry.redhat.io/devspaces/server-rhel8"
+"devspaces/theia-endpoint-rhel8" = "registry.redhat.io/devspaces/theia-endpoint-rhel8"
+"devspaces/theia-rhel8" = "registry.redhat.io/devspaces/theia-rhel8"
+"devspaces/traefik-rhel8" = "registry.redhat.io/devspaces/traefik-rhel8"
+"devspaces/udi-rhel8" = "registry.redhat.io/devspaces/udi-rhel8"
 "devtools/go-toolset-rhel7" = "registry.access.redhat.com/devtools/go-toolset-rhel7"
-"distributed-tracing/jaeger-agent-rhel8" = "registry.redhat.io/distributed-tracing/jaeger-agent-rhel8"
-"distributed-tracing/jaeger-all-in-one-rhel8" = "registry.redhat.io/distributed-tracing/jaeger-all-in-one-rhel8"
-"distributed-tracing/jaeger-collector-rhel8" = "registry.redhat.io/distributed-tracing/jaeger-collector-rhel8"
-"distributed-tracing/jaeger-es-index-cleaner-rhel8" = "registry.redhat.io/distributed-tracing/jaeger-es-index-cleaner-rhel8"
-"distributed-tracing/jaeger-es-rollover-rhel8" = "registry.redhat.io/distributed-tracing/jaeger-es-rollover-rhel8"
-"distributed-tracing/jaeger-ingester-rhel8" = "registry.redhat.io/distributed-tracing/jaeger-ingester-rhel8"
-"distributed-tracing/jaeger-operator-bundle" = "registry.redhat.io/distributed-tracing/jaeger-operator-bundle"
-"distributed-tracing/jaeger-query-rhel8" = "registry.redhat.io/distributed-tracing/jaeger-query-rhel8"
-"distributed-tracing/jaeger-rhel8-operator" = "registry.redhat.io/distributed-tracing/jaeger-rhel8-operator"
+"discovery/discovery-server-rhel8" = "registry.redhat.io/discovery/discovery-server-rhel8"
 "dotnet/dotnet-31-jenkins-agent-rhel7" = "registry.redhat.io/dotnet/dotnet-31-jenkins-agent-rhel7"
 "dotnet/dotnet-31-rhel7" = "registry.redhat.io/dotnet/dotnet-31-rhel7"
 "dotnet/dotnet-31-runtime-rhel7" = "registry.redhat.io/dotnet/dotnet-31-runtime-rhel7"
@@ -548,6 +587,7 @@
 "dynatrace/dynatrace-oneagent-operator-0-1-0" = "registry.connect.redhat.com/dynatrace/dynatrace-oneagent-operator-0-1-0"
 "dynatrace/dynatrace-oneagent-operator-bundle" = "registry.redhat.io/dynatrace/dynatrace-oneagent-operator-bundle"
 "dynatrace/dynatrace-oneagent-operator" = "registry.connect.redhat.com/dynatrace/dynatrace-oneagent-operator"
+"dynatrace/dynatrace-operator-bundle-marketplace" = "registry.connect.redhat.com/dynatrace/dynatrace-operator-bundle-marketplace"
 "dynatrace/dynatrace-operator-bundle" = "registry.redhat.io/dynatrace/dynatrace-operator-bundle"
 "dynatrace/dynatrace-operator" = "registry.connect.redhat.com/dynatrace/dynatrace-operator"
 "dynatrace/oneagent" = "registry.connect.redhat.com/dynatrace/oneagent"
@@ -555,6 +595,9 @@
 "e2e-container/workflow-test" = "registry.access.redhat.com/e2e-container/workflow-test"
 "eamli/eamli-operator-bundle" = "registry.connect.redhat.com/eamli/eamli-operator-bundle"
 "edb/edb-operator" = "quay.io/edb/edb-operator"
+"edo/external-dns-operator-bundle" = "registry.access.redhat.com/edo/external-dns-operator-bundle"
+"edo/external-dns-rhel8-operator" = "registry.access.redhat.com/edo/external-dns-rhel8-operator"
+"edo/external-dns-rhel8" = "registry.access.redhat.com/edo/external-dns-rhel8"
 "elastic/apm" = "registry.connect.redhat.com/elastic/apm"
 "elastic/auditbeat" = "registry.connect.redhat.com/elastic/auditbeat"
 "elastic/eck-operator" = "registry.connect.redhat.com/elastic/eck-operator"
@@ -575,6 +618,7 @@
 "entando/entando-eap71-openshift-imagick" = "registry.connect.redhat.com/entando/entando-eap71-openshift-imagick"
 "entando/entando-operator" = "registry.connect.redhat.com/entando/entando-operator"
 "entando/entando-redhat-sso" = "registry.connect.redhat.com/entando/entando-redhat-sso"
+"enterprisedb/cloud-native-postgresql-ocp-certified-testing" = "quay.io/enterprisedb/cloud-native-postgresql-ocp-certified-testing"
 "enterprisedb/cloud-native-postgresql" = "registry.connect.redhat.com/enterprisedb/cloud-native-postgresql"
 "enterprisedb/edb-bart" = "registry.redhat.io/enterprisedb/edb-bart"
 "enterprisedb/edb-epas-lite11" = "registry.connect.redhat.com/enterprisedb/edb-epas-lite11"
@@ -593,7 +637,10 @@
 "findability-sciences/fp-predict-plus-operator" = "registry.connect.redhat.com/findability-sciences/fp-predict-plus-operator"
 "findability-sciences/fp-predict-plus" = "registry.redhat.io/findability-sciences/fp-predict-plus"
 "fiware/orion-ld" = "quay.io/fiware/orion-ld"
-"fortanix/ccm-node-agent-dcap-operator-bundle" = "registry.redhat.io/fortanix/ccm-node-agent-dcap-operator-bundle"
+"flux/helm-controller-old" = "registry.connect.redhat.com/flux/helm-controller-old"
+"flux/kustomize-controller-old" = "registry.connect.redhat.com/flux/kustomize-controller-old"
+"flux/source-controller-old" = "registry.connect.redhat.com/flux/source-controller-old"
+"fortanix/ccm-node-agent-dcap-operator-bundle" = "registry.connect.redhat.com/fortanix/ccm-node-agent-dcap-operator-bundle"
 "fortanix/ccm-node-agent-dcap-operator" = "registry.connect.redhat.com/fortanix/ccm-node-agent-dcap-operator"
 "fortanix/ccm-node-agent-operator-bundle" = "registry.connect.redhat.com/fortanix/ccm-node-agent-operator-bundle"
 "fortanix/ccm-node-agent-operator" = "registry.connect.redhat.com/fortanix/ccm-node-agent-operator"
@@ -613,9 +660,19 @@
 "fujitsu/fujitsu-enterprise-postgres-13-pgpool2" = "quay.io/fujitsu/fujitsu-enterprise-postgres-13-pgpool2"
 "fujitsu/fujitsu-enterprise-postgres-13-restore" = "quay.io/fujitsu/fujitsu-enterprise-postgres-13-restore"
 "fujitsu/fujitsu-enterprise-postgres-13-server" = "quay.io/fujitsu/fujitsu-enterprise-postgres-13-server"
+"fujitsu/fujitsu-enterprise-postgres-14-backup" = "registry.redhat.io/fujitsu/fujitsu-enterprise-postgres-14-backup"
+"fujitsu/fujitsu-enterprise-postgres-14-pgpool2" = "quay.io/fujitsu/fujitsu-enterprise-postgres-14-pgpool2"
+"fujitsu/fujitsu-enterprise-postgres-14-restore" = "quay.io/fujitsu/fujitsu-enterprise-postgres-14-restore"
+"fujitsu/fujitsu-enterprise-postgres-14-server" = "quay.io/fujitsu/fujitsu-enterprise-postgres-14-server"
+"fujitsu/fujitsu-enterprise-postgres-14-upgrade" = "quay.io/fujitsu/fujitsu-enterprise-postgres-14-upgrade"
+"fujitsu/fujitsu-enterprise-postgres-cronjob" = "quay.io/fujitsu/fujitsu-enterprise-postgres-cronjob"
+"fujitsu/fujitsu-enterprise-postgres-exporter" = "quay.io/fujitsu/fujitsu-enterprise-postgres-exporter"
+"fujitsu/fujitsu-enterprise-postgres-fluentbit" = "quay.io/fujitsu/fujitsu-enterprise-postgres-fluentbit"
+"fujitsu/fujitsu-enterprise-postgres-fluentd" = "quay.io/fujitsu/fujitsu-enterprise-postgres-fluentd"
+"fujitsu/fujitsu-enterprise-postgres-operator" = "quay.io/fujitsu/fujitsu-enterprise-postgres-operator"
 "fujitsu-postgres/fujitsu-enterprise-postgres-13-bundle" = "registry.redhat.io/fujitsu-postgres/fujitsu-enterprise-postgres-13-bundle"
 "fujitsu-postgres/fujitsu-enterprise-postgres-bundle" = "registry.connect.redhat.com/fujitsu-postgres/fujitsu-enterprise-postgres-bundle"
-"fujitsu-postgres/fujitsu-enterprise-postgres-operator" = "registry.connect.redhat.com/fujitsu-postgres/fujitsu-enterprise-postgres-operator"
+"fujitsu-postgres/fujitsu-enterprise-postgres-operator-bundle" = "registry.connect.redhat.com/fujitsu-postgres/fujitsu-enterprise-postgres-operator-bundle"
 "fujitsu/rhosp13-fujitsu-cinder-volume-161" = "registry.connect.redhat.com/fujitsu/rhosp13-fujitsu-cinder-volume-161"
 "fujitsu/rhosp15-fujitsu-cinder-volume-161" = "registry.redhat.io/fujitsu/rhosp15-fujitsu-cinder-volume-161"
 "fujitsu/rhosp161-fujitsu-cinder-volume-16" = "registry.connect.redhat.com/fujitsu/rhosp161-fujitsu-cinder-volume-16"
@@ -630,7 +687,6 @@
 "fuse7/fuse-eap-openshift-jdk11-rhel8" = "registry.redhat.io/fuse7/fuse-eap-openshift-jdk11-rhel8"
 "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-openj9-11-rhel8" = "registry.redhat.io/fuse7/fuse-java-openshift-openj9-11-rhel8"
 "fuse7/fuse-java-openshift-rhel8" = "registry.redhat.io/fuse7/fuse-java-openshift-rhel8"
 "fuse7/fuse-karaf-openshift-jdk11-rhel8" = "registry.redhat.io/fuse7/fuse-karaf-openshift-jdk11-rhel8"
 "fuse7/fuse-karaf-openshift-rhel8" = "registry.redhat.io/fuse7/fuse-karaf-openshift-rhel8"
@@ -659,6 +715,7 @@
 "gluufederation/oxpassport" = "registry.connect.redhat.com/gluufederation/oxpassport"
 "gluufederation/oxshibboleth" = "registry.connect.redhat.com/gluufederation/oxshibboleth"
 "gluufederation/oxtrust" = "registry.connect.redhat.com/gluufederation/oxtrust"
+"grafana/openshift-cloud-log-forwarder-bundle" = "registry.connect.redhat.com/grafana/openshift-cloud-log-forwarder-bundle"
 "gtsoftware/ivory-server" = "registry.redhat.io/gtsoftware/ivory-server"
 "gtsoftware/ivory-service-architect-operator-bundle" = "registry.redhat.io/gtsoftware/ivory-service-architect-operator-bundle"
 "guardicore/centra" = "registry.connect.redhat.com/guardicore/centra"
@@ -672,6 +729,7 @@
 "hashicorp/consul-k8s-control-plane" = "registry.connect.redhat.com/hashicorp/consul-k8s-control-plane"
 "hashicorp/consul-k8s" = "registry.connect.redhat.com/hashicorp/consul-k8s"
 "hashicorp/consul" = "registry.connect.redhat.com/hashicorp/consul"
+"hashicorp/vault-enterprise-fips" = "registry.connect.redhat.com/hashicorp/vault-enterprise-fips"
 "hashicorp/vault-enterprise" = "registry.connect.redhat.com/hashicorp/vault-enterprise"
 "hashicorp/vault-k8s" = "registry.redhat.io/hashicorp/vault-k8s"
 "hashicorp/vault" = "registry.redhat.io/hashicorp/vault"
@@ -717,6 +775,9 @@
 "hpestorage/xspc-csi-operator-bundle" = "registry.connect.redhat.com/hpestorage/xspc-csi-operator-bundle"
 "hpestorage/xspc-csi-provisioner" = "registry.connect.redhat.com/hpestorage/xspc-csi-provisioner"
 "hxcsiadmin/hxcsi-helm-bundle" = "registry.connect.redhat.com/hxcsiadmin/hxcsi-helm-bundle"
+"hxcsiadmin/hxcsi-helm-operator" = "quay.io/hxcsiadmin/hxcsi-helm-operator"
+"hxcsiadmin/hxcsi-ubi8" = "quay.io/hxcsiadmin/hxcsi-ubi8"
+"hytrust/ht-getkey1" = "registry.connect.redhat.com/hytrust/ht-getkey1"
 "ibm/appsody-application-operator" = "registry.redhat.io/ibm/appsody-application-operator"
 "ibm/appsody-operator-certified-bundle" = "registry.connect.redhat.com/ibm/appsody-operator-certified-bundle"
 "ibm/aspera-hsts-aej" = "registry.connect.redhat.com/ibm/aspera-hsts-aej"
@@ -792,7 +853,9 @@
 "ibm/ibm-semeru-runtime-certified-11-jre-ubi-min" = "registry.connect.redhat.com/ibm/ibm-semeru-runtime-certified-11-jre-ubi-min"
 "ibm/ibm-semeru-runtime-certified-11-jre-ubi" = "registry.connect.redhat.com/ibm/ibm-semeru-runtime-certified-11-jre-ubi"
 "ibm/ibm-semeru-runtime-certified-jdk-11-ubi-minimal" = "registry.connect.redhat.com/ibm/ibm-semeru-runtime-certified-jdk-11-ubi-minimal"
-"ibm/ibm-semeru-runtime-certified-jdk-11-ubi" = "registry.redhat.io/ibm/ibm-semeru-runtime-certified-jdk-11-ubi"
+"ibm/ibm-semeru-runtime-certified-jdk-11-ubi" = "registry.connect.redhat.com/ibm/ibm-semeru-runtime-certified-jdk-11-ubi"
+"ibm/ibm-semeru-runtime-certified-jdk-17-ubi-minimal" = "registry.connect.redhat.com/ibm/ibm-semeru-runtime-certified-jdk-17-ubi-minimal"
+"ibm/ibm-semeru-runtime-certified-jdk-17-ubi" = "registry.connect.redhat.com/ibm/ibm-semeru-runtime-certified-jdk-17-ubi"
 "ibm/ibm-semeru-runtime-open-17-jdk-ubi-min" = "registry.connect.redhat.com/ibm/ibm-semeru-runtime-open-17-jdk-ubi-min"
 "ibm/ibm-semeru-runtime-open-17-jdk-ubi" = "registry.connect.redhat.com/ibm/ibm-semeru-runtime-open-17-jdk-ubi"
 "ibm/ibm-semeru-runtime-open-17-jre-ubi-min" = "registry.connect.redhat.com/ibm/ibm-semeru-runtime-open-17-jre-ubi-min"
@@ -852,6 +915,8 @@
 "identity-config/mgmt-operator-bundle" = "registry.redhat.io/identity-config/mgmt-operator-bundle"
 "identity-config/mgmt-rhel8-operator" = "registry.redhat.io/identity-config/mgmt-rhel8-operator"
 "infinidat/cinder-volume" = "registry.connect.redhat.com/infinidat/cinder-volume"
+"infinidat/infinibox-csidriver-certified" = "registry.redhat.io/infinidat/infinibox-csidriver-certified"
+"infinidat/infinibox-operator-certified" = "registry.connect.redhat.com/infinidat/infinibox-operator-certified"
 "influxdata/influxdb-1x" = "registry.connect.redhat.com/influxdata/influxdb-1x"
 "influxdata/telegraf-1x" = "registry.connect.redhat.com/influxdata/telegraf-1x"
 "infoblox/rhosp13-infoblox-ipam-agent" = "registry.redhat.io/infoblox/rhosp13-infoblox-ipam-agent"
@@ -868,8 +933,10 @@
 "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-sql-rhel8" = "registry.redhat.io/integration/service-registry-sql-rhel8"
+"intel/aikit-operator-bundle-marketplace" = "registry.redhat.io/intel/aikit-operator-bundle-marketplace"
 "intel/aikit-operator-bundle" = "registry.connect.redhat.com/intel/aikit-operator-bundle"
 "intel/aikit-operator" = "registry.connect.redhat.com/intel/aikit-operator"
+"intel/intel-device-plugins-operator-bundle" = "registry.connect.redhat.com/intel/intel-device-plugins-operator-bundle"
 "intel/n3000-daemon" = "registry.connect.redhat.com/intel/n3000-daemon"
 "intel/n3000-driver" = "registry.connect.redhat.com/intel/n3000-driver"
 "intel/n3000-labeler" = "registry.connect.redhat.com/intel/n3000-labeler"
@@ -882,6 +949,7 @@
 "intel/openvino-runtime" = "registry.connect.redhat.com/intel/openvino-runtime"
 "intel/ovms-operator-bundle" = "registry.connect.redhat.com/intel/ovms-operator-bundle"
 "intel/ovms-operator" = "registry.connect.redhat.com/intel/ovms-operator"
+"intel/ovms-operator-rhmp-bundle" = "registry.connect.redhat.com/intel/ovms-operator-rhmp-bundle"
 "intel/pmem-csi-driver-os" = "registry.connect.redhat.com/intel/pmem-csi-driver-os"
 "intel/pmem-csi-operator-os" = "registry.connect.redhat.com/intel/pmem-csi-operator-os"
 "intel/sriov-fec-daemon" = "registry.connect.redhat.com/intel/sriov-fec-daemon"
@@ -890,35 +958,31 @@
 "intel/tensorflow-mpi-horovod" = "registry.connect.redhat.com/intel/tensorflow-mpi-horovod"
 "intel/tensorflow" = "registry.redhat.io/intel/tensorflow"
 "introspective-networks/smokevpn1" = "registry.connect.redhat.com/introspective-networks/smokevpn1"
+"isovalent/cilium-ee-olm-metadata" = "registry.connect.redhat.com/isovalent/cilium-ee-olm-metadata"
 "isovalent/cilium-ee-olm" = "registry.redhat.io/isovalent/cilium-ee-olm"
 "isovalent/cilium-olm-metadata" = "registry.redhat.io/isovalent/cilium-olm-metadata"
 "isovalent/cilium-olm" = "registry.connect.redhat.com/isovalent/cilium-olm"
 "isovalent/cilium" = "registry.connect.redhat.com/isovalent/cilium"
 "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-7/eap72-openj9-11-openshift-rhel8" = "registry.redhat.io/jboss-eap-7/eap72-openj9-11-openshift-rhel8"
 "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/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/eap74-openjdk8-runtime-openshift-rhel7" = "registry.redhat.io/jboss-eap-7/eap74-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/eap-xp4-openjdk11-openshift-rhel8" = "registry.redhat.io/jboss-eap-7/eap-xp4-openjdk11-openshift-rhel8"
+"jboss-eap-7/eap-xp4-openjdk11-runtime-openshift-rhel8" = "registry.redhat.io/jboss-eap-7/eap-xp4-openjdk11-runtime-openshift-rhel8"
 "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-3/webserver31-tomcat7-openshift" = "registry.access.redhat.com/jboss-webserver-3/webserver31-tomcat7-openshift"
 "jboss-webserver-3/webserver31-tomcat8-openshift" = "registry.access.redhat.com/jboss-webserver-3/webserver31-tomcat8-openshift"
-"jboss-webserver-5/jws56-openj9-11-openshift-rhel8" = "registry.redhat.io/jboss-webserver-5/jws56-openj9-11-openshift-rhel8"
 "jboss-webserver-5/jws56-openjdk11-openshift-rhel8" = "registry.redhat.io/jboss-webserver-5/jws56-openjdk11-openshift-rhel8"
 "jboss-webserver-5/jws56-openjdk8-openshift-rhel8" = "registry.redhat.io/jboss-webserver-5/jws56-openjdk8-openshift-rhel8"
 "jboss-webserver-5/webserver-openjdk8-operator-bundle" = "registry.redhat.io/jboss-webserver-5/webserver-openjdk8-operator-bundle"
@@ -935,7 +999,7 @@
 "jfrog/pipelines-micro" = "registry.connect.redhat.com/jfrog/pipelines-micro"
 "jfrog/pipelines-node" = "registry.connect.redhat.com/jfrog/pipelines-node"
 "jfrog/pipelines-operator-bundle" = "registry.connect.redhat.com/jfrog/pipelines-operator-bundle"
-"jfrog/pipelines-operator" = "registry.connect.redhat.com/jfrog/pipelines-operator"
+"jfrog/pipelines-operator" = "registry.redhat.io/jfrog/pipelines-operator"
 "jfrog/pipelines-rabbitmq" = "registry.connect.redhat.com/jfrog/pipelines-rabbitmq"
 "jfrog/pipelines-router" = "registry.connect.redhat.com/jfrog/pipelines-router"
 "jfrog/pipelines-vault-init" = "registry.connect.redhat.com/jfrog/pipelines-vault-init"
@@ -950,6 +1014,7 @@
 "jfrog/xray-router" = "registry.connect.redhat.com/jfrog/xray-router"
 "jfrog/xray-server" = "registry.connect.redhat.com/jfrog/xray-server"
 "jinfonet/jreport-server15" = "registry.connect.redhat.com/jinfonet/jreport-server15"
+"jinhli0/ubi8_test" = "quay.io/jinhli0/ubi8_test"
 "joget/joget-dx7-eap7" = "registry.connect.redhat.com/joget/joget-dx7-eap7"
 "joget/joget-dx-operator-bundle" = "registry.connect.redhat.com/joget/joget-dx-operator-bundle"
 "joget/joget-dx-operator-bundle-rhmp" = "registry.connect.redhat.com/joget/joget-dx-operator-bundle-rhmp"
@@ -961,16 +1026,19 @@
 "kasten/bloblifecyclemanager" = "registry.connect.redhat.com/kasten/bloblifecyclemanager"
 "kasten/catalog" = "registry.redhat.io/kasten/catalog"
 "kasten/cephtool" = "registry.connect.redhat.com/kasten/cephtool"
-"kasten/configmap-reload" = "registry.connect.redhat.com/kasten/configmap-reload"
+"kasten/configmap-reload" = "registry.redhat.io/kasten/configmap-reload"
 "kasten/config" = "registry.connect.redhat.com/kasten/config"
+"kasten/controllermanager" = "registry.redhat.io/kasten/controllermanager"
 "kasten/crypto" = "registry.connect.redhat.com/kasten/crypto"
 "kasten/dashboardbff" = "registry.connect.redhat.com/kasten/dashboardbff"
 "kasten/datamover" = "registry.connect.redhat.com/kasten/datamover"
 "kasten/dex" = "registry.connect.redhat.com/kasten/dex"
+"kasten/emissary" = "registry.connect.redhat.com/kasten/emissary"
 "kasten/events" = "registry.redhat.io/kasten/events"
 "kasten/executor" = "registry.connect.redhat.com/kasten/executor"
 "kasten/frontend" = "registry.redhat.io/kasten/frontend"
 "kasten/grafana" = "registry.connect.redhat.com/kasten/grafana"
+"kasten/init" = "registry.redhat.io/kasten/init"
 "kasten/jobs" = "registry.connect.redhat.com/kasten/jobs"
 "kasten/k10-operator-paygo" = "registry.connect.redhat.com/kasten/k10-operator-paygo"
 "kasten/k10-operator" = "registry.connect.redhat.com/kasten/k10-operator"
@@ -981,8 +1049,10 @@
 "kasten/kasten-rhmp-bundle" = "registry.connect.redhat.com/kasten/kasten-rhmp-bundle"
 "kasten/kasten-term-rhmp-bundle" = "registry.connect.redhat.com/kasten/kasten-term-rhmp-bundle"
 "kasten/logging" = "registry.connect.redhat.com/kasten/logging"
-"kasten/metering" = "registry.redhat.io/kasten/metering"
+"kasten/mccontrollermanager" = "registry.redhat.io/kasten/mccontrollermanager"
+"kasten/metering" = "registry.connect.redhat.com/kasten/metering"
 "kasten/prometheus" = "registry.redhat.io/kasten/prometheus"
+"kasten/restorectl" = "registry.connect.redhat.com/kasten/restorectl"
 "kasten/state" = "registry.connect.redhat.com/kasten/state"
 "kasten/upgrade" = "registry.connect.redhat.com/kasten/upgrade"
 "kong/kong-ingress-controller" = "registry.redhat.io/kong/kong-ingress-controller"
@@ -990,6 +1060,10 @@
 "kong/kong-offline-operator1" = "registry.connect.redhat.com/kong/kong-offline-operator1"
 "kong/kong-operator1" = "registry.connect.redhat.com/kong/kong-operator1"
 "kong/kong" = "registry.connect.redhat.com/kong/kong"
+"kovair/kovairdevops" = "registry.connect.redhat.com/kovair/kovairdevops"
+"kove/kove-agent" = "quay.io/kove/kove-agent"
+"kove/kove-client-drivers" = "quay.io/kove/kove-client-drivers"
+"kove/kove-container-hook" = "quay.io/kove/kove-container-hook"
 "kubemq/kubemq-bridges" = "registry.connect.redhat.com/kubemq/kubemq-bridges"
 "kubemq/kubemq-operator-bundle" = "registry.connect.redhat.com/kubemq/kubemq-operator-bundle"
 "kubemq/kubemq-operator" = "registry.connect.redhat.com/kubemq/kubemq-operator"
@@ -1009,6 +1083,7 @@
 "linbit/linstor-operator" = "registry.connect.redhat.com/linbit/linstor-operator"
 "linbit/linstor-satellite" = "registry.redhat.io/linbit/linstor-satellite"
 "lucep/omnipath" = "registry.connect.redhat.com/lucep/omnipath"
+"manta-ubi8/mantaflow-operator-bundle" = "registry.connect.redhat.com/manta-ubi8/mantaflow-operator-bundle"
 "maprtech/csi-kdfplugin" = "registry.connect.redhat.com/maprtech/csi-kdfplugin"
 "maprtech/csi-kdfprovisioner" = "registry.connect.redhat.com/maprtech/csi-kdfprovisioner"
 "maprtech/csi-nfsplugin" = "registry.connect.redhat.com/maprtech/csi-nfsplugin"
@@ -1022,6 +1097,9 @@
 "memsql/operator-bundle" = "registry.connect.redhat.com/memsql/operator-bundle"
 "memsql/operator" = "registry.redhat.io/memsql/operator"
 "memsql/quickstart" = "registry.connect.redhat.com/memsql/quickstart"
+"memverge/memory-machine-operator-image" = "registry.connect.redhat.com/memverge/memory-machine-operator-image"
+"memverge/memory-machine-operator" = "registry.redhat.io/memverge/memory-machine-operator"
+"memverge/memory-machine" = "registry.connect.redhat.com/memverge/memory-machine"
 "migration-toolkit-virtualization/mtv-controller-rhel8" = "registry.redhat.io/migration-toolkit-virtualization/mtv-controller-rhel8"
 "migration-toolkit-virtualization/mtv-must-gather-api-rhel8" = "registry.access.redhat.com/migration-toolkit-virtualization/mtv-must-gather-api-rhel8"
 "migration-toolkit-virtualization/mtv-must-gather-rhel8" = "registry.access.redhat.com/migration-toolkit-virtualization/mtv-must-gather-rhel8"
@@ -1030,6 +1108,7 @@
 "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"
 "migration-toolkit-virtualization/mtv-virt-v2v-rhel8" = "registry.access.redhat.com/migration-toolkit-virtualization/mtv-virt-v2v-rhel8"
+"minio/minio-operator1-marketplace" = "registry.redhat.io/minio/minio-operator1-marketplace"
 "minio/minio-operator1" = "registry.connect.redhat.com/minio/minio-operator1"
 "minio/minio-operator" = "registry.connect.redhat.com/minio/minio-operator"
 "mongodb/enterprise-database" = "registry.connect.redhat.com/mongodb/enterprise-database"
@@ -1037,20 +1116,57 @@
 "mongodb/enterprise-operator" = "registry.connect.redhat.com/mongodb/enterprise-operator"
 "mongodb/init-appdb" = "registry.connect.redhat.com/mongodb/init-appdb"
 "mongodb/mongodb-agent" = "registry.connect.redhat.com/mongodb/mongodb-agent"
-"mongodb/mongodb-enterprise-appdb-database" = "registry.connect.redhat.com/mongodb/mongodb-enterprise-appdb-database"
-"mongodb/mongodb-enterprise-appdb" = "registry.connect.redhat.com/mongodb/mongodb-enterprise-appdb"
+"mongodb/mongodb-enterprise-appdb-database" = "registry.redhat.io/mongodb/mongodb-enterprise-appdb-database"
+"mongodb/mongodb-enterprise-appdb" = "registry.redhat.io/mongodb/mongodb-enterprise-appdb"
 "mongodb/mongodb-enterprise-init-appdb" = "registry.connect.redhat.com/mongodb/mongodb-enterprise-init-appdb"
 "mongodb/mongodb-enterprise-init-database" = "registry.connect.redhat.com/mongodb/mongodb-enterprise-init-database"
 "mongodb/mongodb-enterprise-init-ops-manager" = "registry.connect.redhat.com/mongodb/mongodb-enterprise-init-ops-manager"
 "mongodb/mongodb-enterprise-ops-manager" = "registry.connect.redhat.com/mongodb/mongodb-enterprise-ops-manager"
 "montier/od1" = "registry.redhat.io/montier/od1"
+"mrhcert/nginx-bccsvc" = "quay.io/mrhcert/nginx-bccsvc"
+"mrhcert/nginx-dalsvc" = "quay.io/mrhcert/nginx-dalsvc"
+"mrhcert/nginx-dprmsvc" = "quay.io/mrhcert/nginx-dprmsvc"
+"mrhcert/nginx-du" = "quay.io/mrhcert/nginx-du"
+"mrhcert/nginx-gwsvc" = "quay.io/mrhcert/nginx-gwsvc"
+"mrhcert/nginx-intfmgrsvc" = "quay.io/mrhcert/nginx-intfmgrsvc"
+"mrhcert/nginx-iwfsvc" = "quay.io/mrhcert/nginx-iwfsvc"
+"mrhcert/nginx" = "quay.io/mrhcert/nginx"
+"mrhcert/nginx-sctp_e1_iwf" = "quay.io/mrhcert/nginx-sctp_e1_iwf"
+"mrhcert/nginx-sctp_f1_iwf" = "quay.io/mrhcert/nginx-sctp_f1_iwf"
+"mrhcert/nginx-sctp_ng_client_iwf" = "quay.io/mrhcert/nginx-sctp_ng_client_iwf"
+"mrhcert/nginx-sctp_xn_iwf" = "quay.io/mrhcert/nginx-sctp_xn_iwf"
+"mrhcert/nginx-srmsvc" = "quay.io/mrhcert/nginx-srmsvc"
+"mrhcert/nginx-ue_conn_mgr" = "quay.io/mrhcert/nginx-ue_conn_mgr"
+"multicluster-engine/agent-service-rhel8" = "registry.redhat.io/multicluster-engine/agent-service-rhel8"
+"multicluster-engine/apiserver-network-proxy-rhel8" = "registry.redhat.io/multicluster-engine/apiserver-network-proxy-rhel8"
+"multicluster-engine/assisted-image-service-rhel8" = "registry.redhat.io/multicluster-engine/assisted-image-service-rhel8"
+"multicluster-engine/assisted-installer-agent-rhel8" = "registry.redhat.io/multicluster-engine/assisted-installer-agent-rhel8"
+"multicluster-engine/assisted-installer-reporter-rhel8" = "registry.redhat.io/multicluster-engine/assisted-installer-reporter-rhel8"
+"multicluster-engine/assisted-installer-rhel8" = "registry.redhat.io/multicluster-engine/assisted-installer-rhel8"
+"multicluster-engine/aws-encryption-provider-rhel8" = "registry.redhat.io/multicluster-engine/aws-encryption-provider-rhel8"
 "multicluster-engine/backplane-rhel8-operator" = "registry.redhat.io/multicluster-engine/backplane-rhel8-operator"
+"multicluster-engine/cluster-api-provider-agent-rhel8" = "registry.redhat.io/multicluster-engine/cluster-api-provider-agent-rhel8"
+"multicluster-engine/cluster-api-provider-aws-rhel8" = "registry.redhat.io/multicluster-engine/cluster-api-provider-aws-rhel8"
+"multicluster-engine/cluster-api-provider-azure-rhel8" = "registry.redhat.io/multicluster-engine/cluster-api-provider-azure-rhel8"
+"multicluster-engine/cluster-api-provider-kubevirt-rhel8" = "registry.redhat.io/multicluster-engine/cluster-api-provider-kubevirt-rhel8"
+"multicluster-engine/cluster-api-rhel8" = "registry.redhat.io/multicluster-engine/cluster-api-rhel8"
+"multicluster-engine/clusterclaims-controller-rhel8" = "registry.redhat.io/multicluster-engine/clusterclaims-controller-rhel8"
+"multicluster-engine/cluster-curator-controller-rhel8" = "registry.redhat.io/multicluster-engine/cluster-curator-controller-rhel8"
+"multicluster-engine/clusterlifecycle-state-metrics-rhel8" = "registry.redhat.io/multicluster-engine/clusterlifecycle-state-metrics-rhel8"
+"multicluster-engine/console-mce-rhel8" = "registry.redhat.io/multicluster-engine/console-mce-rhel8"
+"multicluster-engine/discovery-rhel8" = "registry.redhat.io/multicluster-engine/discovery-rhel8"
 "multicluster-engine/hive-rhel8" = "registry.redhat.io/multicluster-engine/hive-rhel8"
+"multicluster-engine/hypershift-addon-rhel8-operator" = "registry.redhat.io/multicluster-engine/hypershift-addon-rhel8-operator"
+"multicluster-engine/hypershift-deployment-controller-rhel8" = "registry.redhat.io/multicluster-engine/hypershift-deployment-controller-rhel8"
+"multicluster-engine/hypershift-rhel8-operator" = "registry.redhat.io/multicluster-engine/hypershift-rhel8-operator"
+"multicluster-engine/klusterlet-operator-bundle" = "registry.redhat.io/multicluster-engine/klusterlet-operator-bundle"
 "multicluster-engine/managedcluster-import-controller-rhel8" = "registry.redhat.io/multicluster-engine/managedcluster-import-controller-rhel8"
+"multicluster-engine/managed-serviceaccount-rhel8" = "registry.redhat.io/multicluster-engine/managed-serviceaccount-rhel8"
 "multicluster-engine/mce-operator-bundle" = "registry.redhat.io/multicluster-engine/mce-operator-bundle"
 "multicluster-engine/multicloud-manager-rhel8" = "registry.redhat.io/multicluster-engine/multicloud-manager-rhel8"
 "multicluster-engine/must-gather-rhel8" = "registry.redhat.io/multicluster-engine/must-gather-rhel8"
 "multicluster-engine/placement-rhel8" = "registry.redhat.io/multicluster-engine/placement-rhel8"
+"multicluster-engine/provider-credential-controller-rhel8" = "registry.redhat.io/multicluster-engine/provider-credential-controller-rhel8"
 "multicluster-engine/registration-operator-rhel8" = "registry.redhat.io/multicluster-engine/registration-operator-rhel8"
 "multicluster-engine/registration-rhel8" = "registry.redhat.io/multicluster-engine/registration-rhel8"
 "multicluster-engine/work-rhel8" = "registry.redhat.io/multicluster-engine/work-rhel8"
@@ -1087,7 +1203,9 @@
 "nec/webotx-express" = "registry.connect.redhat.com/nec/webotx-express"
 "nec/webotx-operator" = "registry.connect.redhat.com/nec/webotx-operator"
 "netapp/acc-operator-21-12-59" = "registry.connect.redhat.com/netapp/acc-operator-21-12-59"
+"netapp/acc-operator-22-03-29" = "registry.connect.redhat.com/netapp/acc-operator-22-03-29"
 "netapp/acc-operator-bundle" = "registry.connect.redhat.com/netapp/acc-operator-bundle"
+"netapp/ads-operator-bundle" = "registry.redhat.io/netapp/ads-operator-bundle"
 "neuvector/allinone" = "registry.connect.redhat.com/neuvector/allinone"
 "neuvector/controller" = "registry.connect.redhat.com/neuvector/controller"
 "neuvector/enforcer" = "registry.connect.redhat.com/neuvector/enforcer"
@@ -1100,6 +1218,7 @@
 "newrelic-openshift/newrelic-infra-agent" = "registry.redhat.io/newrelic-openshift/newrelic-infra-agent"
 "newrelic-openshift/newrelic-infrastructure-k8s-1" = "registry.connect.redhat.com/newrelic-openshift/newrelic-infrastructure-k8s-1"
 "newrelic-openshift/newrelic-python-agent" = "registry.connect.redhat.com/newrelic-openshift/newrelic-python-agent"
+"newrhc098790/outnew78699" = "registry.connect.redhat.com/newrhc098790/outnew78699"
 "nexenta/rhosp13-openstack-cinder-volume-nexenta" = "registry.connect.redhat.com/nexenta/rhosp13-openstack-cinder-volume-nexenta"
 "nextlabs/controlcenter" = "registry.connect.redhat.com/nextlabs/controlcenter"
 "nextlabs/pc" = "registry.redhat.io/nextlabs/pc"
@@ -1110,6 +1229,11 @@
 "nodesource/nsolid-console-rhel7-latest" = "registry.redhat.io/nodesource/nsolid-console-rhel7-latest"
 "nodesource/nsolid-rhel7-latest" = "registry.connect.redhat.com/nodesource/nsolid-rhel7-latest"
 "noiro/acc-provision-operator" = "quay.io/noiro/acc-provision-operator"
+"noiro/aci-containers-controller" = "quay.io/noiro/aci-containers-controller"
+"noiro/aci-containers-host" = "quay.io/noiro/aci-containers-host"
+"noiro/aci-containers-operator" = "quay.io/noiro/aci-containers-operator"
+"noiro/cnideploy" = "quay.io/noiro/cnideploy"
+"noiro/gbp-server" = "quay.io/noiro/gbp-server"
 "noiro/openstack-ciscoaci-aim" = "registry.connect.redhat.com/noiro/openstack-ciscoaci-aim"
 "noiro/openstack-ciscoaci-lldp" = "registry.connect.redhat.com/noiro/openstack-ciscoaci-lldp"
 "noiro/openstack-ciscoaci-neutron-opflex" = "registry.redhat.io/noiro/openstack-ciscoaci-neutron-opflex"
@@ -1117,6 +1241,8 @@
 "noiro/openstack-heat-engine-ciscoaci" = "registry.connect.redhat.com/noiro/openstack-heat-engine-ciscoaci"
 "noiro/openstack-horizon-ciscoaci" = "registry.connect.redhat.com/noiro/openstack-horizon-ciscoaci"
 "noiro/openstack-neutron-server-ciscoaci" = "registry.connect.redhat.com/noiro/openstack-neutron-server-ciscoaci"
+"noiro/openvswitch" = "quay.io/noiro/openvswitch"
+"noiro/opflex" = "quay.io/noiro/opflex"
 "nuagenetworks/rhosp13-openstack-heat-api-5-4-1-u16" = "registry.connect.redhat.com/nuagenetworks/rhosp13-openstack-heat-api-5-4-1-u16"
 "nuagenetworks/rhosp13-openstack-heat-api-5-4-1-u17" = "registry.connect.redhat.com/nuagenetworks/rhosp13-openstack-heat-api-5-4-1-u17"
 "nuagenetworks/rhosp13-openstack-heat-api-5-4-1-u3" = "registry.connect.redhat.com/nuagenetworks/rhosp13-openstack-heat-api-5-4-1-u3"
@@ -1205,7 +1331,8 @@
 "nuagenetworks/rhosp16-openstack-heat-api-20-10-3" = "registry.connect.redhat.com/nuagenetworks/rhosp16-openstack-heat-api-20-10-3"
 "nuagenetworks/rhosp16-openstack-heat-api-20-10-6" = "registry.connect.redhat.com/nuagenetworks/rhosp16-openstack-heat-api-20-10-6"
 "nuagenetworks/rhosp16-openstack-heat-api-20-10-7" = "registry.connect.redhat.com/nuagenetworks/rhosp16-openstack-heat-api-20-10-7"
-"nuagenetworks/rhosp16-openstack-heat-api-20-5-2" = "registry.connect.redhat.com/nuagenetworks/rhosp16-openstack-heat-api-20-5-2"
+"nuagenetworks/rhosp16-openstack-heat-api-20-10-9" = "registry.redhat.io/nuagenetworks/rhosp16-openstack-heat-api-20-10-9"
+"nuagenetworks/rhosp16-openstack-heat-api-20-5-2" = "registry.redhat.io/nuagenetworks/rhosp16-openstack-heat-api-20-5-2"
 "nuagenetworks/rhosp16-openstack-heat-api-20-5-3" = "registry.connect.redhat.com/nuagenetworks/rhosp16-openstack-heat-api-20-5-3"
 "nuagenetworks/rhosp16-openstack-heat-api-cfn-20-10-1" = "registry.connect.redhat.com/nuagenetworks/rhosp16-openstack-heat-api-cfn-20-10-1"
 "nuagenetworks/rhosp16-openstack-heat-api-cfn-20-10-2" = "registry.connect.redhat.com/nuagenetworks/rhosp16-openstack-heat-api-cfn-20-10-2"
@@ -1213,6 +1340,7 @@
 "nuagenetworks/rhosp16-openstack-heat-api-cfn-20-10-5" = "registry.connect.redhat.com/nuagenetworks/rhosp16-openstack-heat-api-cfn-20-10-5"
 "nuagenetworks/rhosp16-openstack-heat-api-cfn-20-10-6" = "registry.connect.redhat.com/nuagenetworks/rhosp16-openstack-heat-api-cfn-20-10-6"
 "nuagenetworks/rhosp16-openstack-heat-api-cfn-20-10-7" = "registry.connect.redhat.com/nuagenetworks/rhosp16-openstack-heat-api-cfn-20-10-7"
+"nuagenetworks/rhosp16-openstack-heat-api-cfn-20-10-9" = "registry.connect.redhat.com/nuagenetworks/rhosp16-openstack-heat-api-cfn-20-10-9"
 "nuagenetworks/rhosp16-openstack-heat-api-cfn-20-5-2" = "registry.connect.redhat.com/nuagenetworks/rhosp16-openstack-heat-api-cfn-20-5-2"
 "nuagenetworks/rhosp16-openstack-heat-api-cfn-20-5-3" = "registry.connect.redhat.com/nuagenetworks/rhosp16-openstack-heat-api-cfn-20-5-3"
 "nuagenetworks/rhosp16-openstack-heat-engine-20-10-1" = "registry.connect.redhat.com/nuagenetworks/rhosp16-openstack-heat-engine-20-10-1"
@@ -1221,6 +1349,7 @@
 "nuagenetworks/rhosp16-openstack-heat-engine-20-10-5" = "registry.connect.redhat.com/nuagenetworks/rhosp16-openstack-heat-engine-20-10-5"
 "nuagenetworks/rhosp16-openstack-heat-engine-20-10-6" = "registry.connect.redhat.com/nuagenetworks/rhosp16-openstack-heat-engine-20-10-6"
 "nuagenetworks/rhosp16-openstack-heat-engine-20-10-7" = "registry.connect.redhat.com/nuagenetworks/rhosp16-openstack-heat-engine-20-10-7"
+"nuagenetworks/rhosp16-openstack-heat-engine-20-10-9" = "registry.connect.redhat.com/nuagenetworks/rhosp16-openstack-heat-engine-20-10-9"
 "nuagenetworks/rhosp16-openstack-heat-engine-20-10-latest" = "registry.connect.redhat.com/nuagenetworks/rhosp16-openstack-heat-engine-20-10-latest"
 "nuagenetworks/rhosp16-openstack-heat-engine-20-5-2" = "registry.connect.redhat.com/nuagenetworks/rhosp16-openstack-heat-engine-20-5-2"
 "nuagenetworks/rhosp16-openstack-heat-engine-20-5-3" = "registry.connect.redhat.com/nuagenetworks/rhosp16-openstack-heat-engine-20-5-3"
@@ -1230,6 +1359,7 @@
 "nuagenetworks/rhosp16-openstack-horizon-20-10-5" = "registry.connect.redhat.com/nuagenetworks/rhosp16-openstack-horizon-20-10-5"
 "nuagenetworks/rhosp16-openstack-horizon-20-10-6" = "registry.connect.redhat.com/nuagenetworks/rhosp16-openstack-horizon-20-10-6"
 "nuagenetworks/rhosp16-openstack-horizon-20-10-7" = "registry.connect.redhat.com/nuagenetworks/rhosp16-openstack-horizon-20-10-7"
+"nuagenetworks/rhosp16-openstack-horizon-20-10-9" = "registry.connect.redhat.com/nuagenetworks/rhosp16-openstack-horizon-20-10-9"
 "nuagenetworks/rhosp16-openstack-horizon-20-5-2" = "registry.connect.redhat.com/nuagenetworks/rhosp16-openstack-horizon-20-5-2"
 "nuagenetworks/rhosp16-openstack-horizon-20-5-3" = "registry.connect.redhat.com/nuagenetworks/rhosp16-openstack-horizon-20-5-3"
 "nuagenetworks/rhosp16-openstack-horizon-20-latest" = "registry.redhat.io/nuagenetworks/rhosp16-openstack-horizon-20-latest"
@@ -1239,12 +1369,14 @@
 "nuagenetworks/rhosp16-openstack-neutron-openvswitch-agent-20-10-5" = "registry.redhat.io/nuagenetworks/rhosp16-openstack-neutron-openvswitch-agent-20-10-5"
 "nuagenetworks/rhosp16-openstack-neutron-openvswitch-agent-20-10-6" = "registry.connect.redhat.com/nuagenetworks/rhosp16-openstack-neutron-openvswitch-agent-20-10-6"
 "nuagenetworks/rhosp16-openstack-neutron-openvswitch-agent-20-10-7" = "registry.connect.redhat.com/nuagenetworks/rhosp16-openstack-neutron-openvswitch-agent-20-10-7"
+"nuagenetworks/rhosp16-openstack-neutron-openvswitch-agent-20-10-9" = "registry.connect.redhat.com/nuagenetworks/rhosp16-openstack-neutron-openvswitch-agent-20-10-9"
 "nuagenetworks/rhosp16-openstack-neutron-server-20-10-1" = "registry.connect.redhat.com/nuagenetworks/rhosp16-openstack-neutron-server-20-10-1"
 "nuagenetworks/rhosp16-openstack-neutron-server-20-10-2" = "registry.connect.redhat.com/nuagenetworks/rhosp16-openstack-neutron-server-20-10-2"
 "nuagenetworks/rhosp16-openstack-neutron-server-20-10-3" = "registry.connect.redhat.com/nuagenetworks/rhosp16-openstack-neutron-server-20-10-3"
 "nuagenetworks/rhosp16-openstack-neutron-server-20-10-5" = "registry.connect.redhat.com/nuagenetworks/rhosp16-openstack-neutron-server-20-10-5"
 "nuagenetworks/rhosp16-openstack-neutron-server-20-10-6" = "registry.redhat.io/nuagenetworks/rhosp16-openstack-neutron-server-20-10-6"
-"nuagenetworks/rhosp16-openstack-neutron-server-20-10-7" = "registry.redhat.io/nuagenetworks/rhosp16-openstack-neutron-server-20-10-7"
+"nuagenetworks/rhosp16-openstack-neutron-server-20-10-7" = "registry.connect.redhat.com/nuagenetworks/rhosp16-openstack-neutron-server-20-10-7"
+"nuagenetworks/rhosp16-openstack-neutron-server-20-10-9" = "registry.connect.redhat.com/nuagenetworks/rhosp16-openstack-neutron-server-20-10-9"
 "nuagenetworks/rhosp16-openstack-neutron-server-20-5-2" = "registry.connect.redhat.com/nuagenetworks/rhosp16-openstack-neutron-server-20-5-2"
 "nuagenetworks/rhosp16-openstack-neutron-server-20-5-3" = "registry.connect.redhat.com/nuagenetworks/rhosp16-openstack-neutron-server-20-5-3"
 "nuagenetworks/rhosp16-openstack-nova-compute-20-10-1" = "registry.connect.redhat.com/nuagenetworks/rhosp16-openstack-nova-compute-20-10-1"
@@ -1259,6 +1391,7 @@
 "nutanix/nutanix-csi-operator" = "registry.connect.redhat.com/nutanix/nutanix-csi-operator"
 "nuxeo/nuxeo" = "registry.connect.redhat.com/nuxeo/nuxeo"
 "nvidia/gpu-operator-bundle" = "registry.connect.redhat.com/nvidia/gpu-operator-bundle"
+"nvidia-network-operator/nvidia-network-operator" = "registry.redhat.io/nvidia-network-operator/nvidia-network-operator"
 "oadp/oadp-kubevirt-velero-plugin-rhel8" = "registry.access.redhat.com/oadp/oadp-kubevirt-velero-plugin-rhel8"
 "oadp/oadp-mustgather-rhel8" = "registry.redhat.io/oadp/oadp-mustgather-rhel8"
 "oadp/oadp-operator-bundle" = "registry.access.redhat.com/oadp/oadp-operator-bundle"
@@ -1271,6 +1404,8 @@
 "oadp/oadp-velero-plugin-rhel8" = "registry.access.redhat.com/oadp/oadp-velero-plugin-rhel8"
 "oadp/oadp-velero-restic-restore-helper-rhel8" = "registry.access.redhat.com/oadp/oadp-velero-restic-restore-helper-rhel8"
 "oadp/oadp-velero-rhel8" = "registry.access.redhat.com/oadp/oadp-velero-rhel8"
+"ocp-tools-4/jenkins-agent-base-rhel8" = "registry.redhat.io/ocp-tools-4/jenkins-agent-base-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"
 "ocs4/cephcsi-rhel8" = "registry.redhat.io/ocs4/cephcsi-rhel8"
 "ocs4/mcg-core-rhel8" = "registry.redhat.io/ocs4/mcg-core-rhel8"
@@ -1290,10 +1425,15 @@
 "odf4/ocs-operator-bundle" = "registry.redhat.io/odf4/ocs-operator-bundle"
 "odf4/ocs-rhel8-operator" = "registry.redhat.io/odf4/ocs-rhel8-operator"
 "odf4/odf-console-rhel8" = "registry.redhat.io/odf4/odf-console-rhel8"
+"odf4/odf-csi-addons-rhel8-operator" = "registry.access.redhat.com/odf4/odf-csi-addons-rhel8-operator"
+"odf4/odf-csi-addons-sidecar-rhel8" = "registry.access.redhat.com/odf4/odf-csi-addons-sidecar-rhel8"
+"odf4/odf-lvm-must-gather-rhel8" = "registry.access.redhat.com/odf4/odf-lvm-must-gather-rhel8"
+"odf4/odf-lvm-rhel8-operator" = "registry.access.redhat.com/odf4/odf-lvm-rhel8-operator"
 "odf4/odf-multicluster-operator-bundle" = "registry.redhat.io/odf4/odf-multicluster-operator-bundle"
 "odf4/odf-multicluster-rhel8-operator" = "registry.redhat.io/odf4/odf-multicluster-rhel8-operator"
 "odf4/odf-operator-bundle" = "registry.redhat.io/odf4/odf-operator-bundle"
 "odf4/odf-rhel8-operator" = "registry.redhat.io/odf4/odf-rhel8-operator"
+"odf4/odf-topolvm-rhel8" = "registry.access.redhat.com/odf4/odf-topolvm-rhel8"
 "odf4/odr-cluster-operator-bundle" = "registry.redhat.io/odf4/odr-cluster-operator-bundle"
 "odf4/odr-hub-operator-bundle" = "registry.redhat.io/odf4/odr-hub-operator-bundle"
 "odf4/odr-rhel8-operator" = "registry.redhat.io/odf4/odr-rhel8-operator"
@@ -1301,6 +1441,8 @@
 "odf4/volume-replication-rhel8-operator" = "registry.redhat.io/odf4/volume-replication-rhel8-operator"
 "ogaye/ogaye-operator-bundle" = "registry.connect.redhat.com/ogaye/ogaye-operator-bundle"
 "ogaye/ogaye" = "registry.connect.redhat.com/ogaye/ogaye"
+"opdev/operator-certification-operator-bundle" = "registry.connect.redhat.com/opdev/operator-certification-operator-bundle"
+"opdev/operator-certification-operator" = "quay.io/opdev/operator-certification-operator"
 "opdev/simple-demo-operator" = "registry.redhat.io/opdev/simple-demo-operator"
 "opencloudio/alertmanager" = "quay.io/opencloudio/alertmanager"
 "opencloudio/audit-garbage-collector" = "quay.io/opencloudio/audit-garbage-collector"
@@ -1425,10 +1567,6 @@
 "opencloudio/system-healthcheck-service" = "quay.io/opencloudio/system-healthcheck-service"
 "opencloudio/tiller-ppc64le" = "quay.io/opencloudio/tiller-ppc64le"
 "opencloudio/tiller" = "quay.io/opencloudio/tiller"
-"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"
-"openj9/openj9-8-rhel8" = "registry.redhat.io/openj9/openj9-8-rhel8"
 "openjdk/openjdk-11-rhel7" = "registry.access.redhat.com/openjdk/openjdk-11-rhel7"
 "openlegacy-corp/as400rpc-operator" = "registry.redhat.io/openlegacy-corp/as400rpc-operator"
 "openlegacy-corp/db2-zos-db-nocode" = "registry.connect.redhat.com/openlegacy-corp/db2-zos-db-nocode"
@@ -1488,7 +1626,6 @@
 "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"
@@ -1497,8 +1634,8 @@
 "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/metrics-schema-installer" = "registry.access.redhat.com/openshift3/metrics-schema-installer"
 "openshift3/mysql-apb" = "registry.access.redhat.com/openshift3/mysql-apb"
-"openshift3/nodejs-builder" = "registry.access.redhat.com/openshift3/nodejs-builder"
 "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"
@@ -1555,9 +1692,11 @@
 "openshift3/prometheus" = "registry.access.redhat.com/openshift3/prometheus"
 "openshift3/registry-console" = "registry.access.redhat.com/openshift3/registry-console"
 "openshift4/cloud-event-proxy-rhel8" = "registry.redhat.io/openshift4/cloud-event-proxy-rhel8"
+"openshift4/cloud-network-config-controller-rhel8" = "registry.redhat.io/openshift4/cloud-network-config-controller-rhel8"
 "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"
 "openshift4/egress-router-cni-rhel8" = "registry.redhat.io/openshift4/egress-router-cni-rhel8"
+"openshift4/frr-rhel8" = "registry.redhat.io/openshift4/frr-rhel8"
 "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/metallb-operator-bundle" = "registry.redhat.io/openshift4/metallb-operator-bundle"
@@ -1565,7 +1704,9 @@
 "openshift4/metallb-rhel8" = "registry.redhat.io/openshift4/metallb-rhel8"
 "openshift4/openshift-lifecycle-must-gather-rhel8" = "registry.redhat.io/openshift4/openshift-lifecycle-must-gather-rhel8"
 "openshift4/openshift-node-maintenance-rhel8-operator" = "registry.redhat.io/openshift4/openshift-node-maintenance-rhel8-operator"
+"openshift4/ose-alibaba-cloud-controller-manager-rhel8" = "registry.redhat.io/openshift4/ose-alibaba-cloud-controller-manager-rhel8"
 "openshift4/ose-alibaba-cloud-csi-driver-container-rhel8" = "registry.redhat.io/openshift4/ose-alibaba-cloud-csi-driver-container-rhel8"
+"openshift4/ose-alibaba-machine-controllers-rhel8" = "registry.redhat.io/openshift4/ose-alibaba-machine-controllers-rhel8"
 "openshift4/ose-ansible-operator" = "registry.redhat.io/openshift4/ose-ansible-operator"
 "openshift4/ose-aws-cloud-controller-manager-rhel8" = "registry.redhat.io/openshift4/ose-aws-cloud-controller-manager-rhel8"
 "openshift4/ose-aws-machine-controllers" = "registry.redhat.io/openshift4/ose-aws-machine-controllers"
@@ -1587,6 +1728,7 @@
 "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"
+"openshift4/ose-cluster-capi-operator-container-rhel8" = "registry.redhat.io/openshift4/ose-cluster-capi-operator-container-rhel8"
 "openshift4/ose-cluster-cloud-controller-manager-operator-rhel8" = "registry.redhat.io/openshift4/ose-cluster-cloud-controller-manager-operator-rhel8"
 "openshift4/ose-cluster-config-operator" = "registry.redhat.io/openshift4/ose-cluster-config-operator"
 "openshift4/ose-cluster-dns-operator" = "registry.redhat.io/openshift4/ose-cluster-dns-operator"
@@ -1659,6 +1801,11 @@
 "openshift4/ose-helm-operator" = "registry.redhat.io/openshift4/ose-helm-operator"
 "openshift4/ose-hyperkube" = "registry.redhat.io/openshift4/ose-hyperkube"
 "openshift4/ose-ibm-cloud-controller-manager-rhel8" = "registry.redhat.io/openshift4/ose-ibm-cloud-controller-manager-rhel8"
+"openshift4/ose-ibmcloud-machine-controllers-rhel8" = "registry.redhat.io/openshift4/ose-ibmcloud-machine-controllers-rhel8"
+"openshift4/ose-ibm-vpc-block-csi-driver-operator-rhel8" = "registry.redhat.io/openshift4/ose-ibm-vpc-block-csi-driver-operator-rhel8"
+"openshift4/ose-ibm-vpc-block-csi-driver-rhel8" = "registry.redhat.io/openshift4/ose-ibm-vpc-block-csi-driver-rhel8"
+"openshift4/ose-ibm-vpc-node-label-updater-rhel8" = "registry.redhat.io/openshift4/ose-ibm-vpc-node-label-updater-rhel8"
+"openshift4/ose-image-customization-controller-rhel8" = "registry.redhat.io/openshift4/ose-image-customization-controller-rhel8"
 "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"
@@ -1687,7 +1834,10 @@
 "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-api-provider-gcp-rhel8" = "registry.redhat.io/openshift4/ose-machine-api-provider-gcp-rhel8"
+"openshift4/ose-machine-api-provider-openstack-rhel8" = "registry.redhat.io/openshift4/ose-machine-api-provider-openstack-rhel8"
 "openshift4/ose-machine-config-operator" = "registry.redhat.io/openshift4/ose-machine-config-operator"
+"openshift4/ose-machine-os-images-rhel8" = "registry.redhat.io/openshift4/ose-machine-os-images-rhel8"
 "openshift4/ose-mdns-publisher-rhel8" = "registry.redhat.io/openshift4/ose-mdns-publisher-rhel8"
 "openshift4/ose-metallb-operator-bundle" = "registry.redhat.io/openshift4/ose-metallb-operator-bundle"
 "openshift4/ose-metering-ansible-operator" = "registry.redhat.io/openshift4/ose-metering-ansible-operator"
@@ -1704,6 +1854,7 @@
 "openshift4/ose-must-gather" = "registry.redhat.io/openshift4/ose-must-gather"
 "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-nutanix-machine-controllers-rhel8" = "registry.redhat.io/openshift4/ose-nutanix-machine-controllers-rhel8"
 "openshift4/ose-oauth-proxy" = "registry.redhat.io/openshift4/ose-oauth-proxy"
 "openshift4/ose-oauth-server-rhel8" = "registry.redhat.io/openshift4/ose-oauth-server-rhel8"
 "openshift4/ose-openshift-apiserver-rhel8" = "registry.redhat.io/openshift4/ose-openshift-apiserver-rhel8"
@@ -1719,6 +1870,7 @@
 "openshift4/ose-operator-sdk-rhel8" = "registry.redhat.io/openshift4/ose-operator-sdk-rhel8"
 "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-powervs-machine-controllers-rhel8" = "registry.redhat.io/openshift4/ose-powervs-machine-controllers-rhel8"
 "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"
@@ -1740,6 +1892,7 @@
 "openshift4/ose-vertical-pod-autoscaler-rhel7-operator-metadata" = "registry.redhat.io/openshift4/ose-vertical-pod-autoscaler-rhel7-operator-metadata"
 "openshift4/ose-vertical-pod-autoscaler-rhel8-operator" = "registry.redhat.io/openshift4/ose-vertical-pod-autoscaler-rhel8-operator"
 "openshift4/ose-vertical-pod-autoscaler-rhel8" = "registry.redhat.io/openshift4/ose-vertical-pod-autoscaler-rhel8"
+"openshift4/ose-vsphere-cloud-controller-manager-rhel8" = "registry.redhat.io/openshift4/ose-vsphere-cloud-controller-manager-rhel8"
 "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"
@@ -1772,20 +1925,30 @@
 "openshift-logging/kibana6-rhel8" = "registry.redhat.io/openshift-logging/kibana6-rhel8"
 "openshift-logging/log-file-metric-exporter-rhel8" = "registry.redhat.io/openshift-logging/log-file-metric-exporter-rhel8"
 "openshift-logging/logging-curator5-rhel8" = "registry.redhat.io/openshift-logging/logging-curator5-rhel8"
+"openshift-logging/logging-loki-rhel8" = "registry.access.redhat.com/openshift-logging/logging-loki-rhel8"
+"openshift-logging/loki-operator-bundle" = "registry.access.redhat.com/openshift-logging/loki-operator-bundle"
+"openshift-logging/loki-rhel8-operator" = "registry.access.redhat.com/openshift-logging/loki-rhel8-operator"
+"openshift-logging/lokistack-gateway-rhel8" = "registry.access.redhat.com/openshift-logging/lokistack-gateway-rhel8"
+"openshift-logging/opa-openshift-rhel8" = "registry.access.redhat.com/openshift-logging/opa-openshift-rhel8"
+"openshift-logging/vector-rhel8" = "registry.redhat.io/openshift-logging/vector-rhel8"
 "openshift/metallb-rhel9" = "registry.redhat.io/openshift/metallb-rhel9"
 "openshift-metering/ose-metering-hadoop-rhel8" = "registry.redhat.io/openshift-metering/ose-metering-hadoop-rhel8"
 "openshift/mirror-registry-rhel8" = "registry.redhat.io/openshift/mirror-registry-rhel8"
+"openshift-pipelines/pipelines-chains-controller-rhel8" = "registry.access.redhat.com/openshift-pipelines/pipelines-chains-controller-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-hub-api-rhel8" = "registry.redhat.io/openshift-pipelines/pipelines-hub-api-rhel8"
+"openshift-pipelines/pipelines-hub-api-rhel8" = "registry.access.redhat.com/openshift-pipelines/pipelines-hub-api-rhel8"
+"openshift-pipelines/pipelines-hub-db-migration-rhel8" = "registry.access.redhat.com/openshift-pipelines/pipelines-hub-db-migration-rhel8"
+"openshift-pipelines/pipelines-hub-ui-rhel8" = "registry.access.redhat.com/openshift-pipelines/pipelines-hub-ui-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-operator-webhook-rhel8" = "registry.access.redhat.com/openshift-pipelines/pipelines-operator-webhook-rhel8"
+"openshift-pipelines/pipelines-pipelines-as-code-rhel8" = "registry.access.redhat.com/openshift-pipelines/pipelines-pipelines-as-code-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-serve-tkn-cli-rhel8" = "registry.redhat.io/openshift-pipelines/pipelines-serve-tkn-cli-rhel8"
@@ -1794,12 +1957,22 @@
 "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-pipelines/pipelines-workingdirinit-rhel8" = "registry.access.redhat.com/openshift-pipelines/pipelines-workingdirinit-rhel8"
+"openshift-sandboxed-containers/osc-monitor-rhel8" = "registry.access.redhat.com/openshift-sandboxed-containers/osc-monitor-rhel8"
+"openshift-sandboxed-containers/osc-must-gather-rhel8" = "registry.access.redhat.com/openshift-sandboxed-containers/osc-must-gather-rhel8"
+"openshift-sandboxed-containers/osc-operator-bundle" = "registry.access.redhat.com/openshift-sandboxed-containers/osc-operator-bundle"
+"openshift-sandboxed-containers/osc-rhel8-operator" = "registry.access.redhat.com/openshift-sandboxed-containers/osc-rhel8-operator"
+"openshift-secondary-scheduler-operator/secondary-scheduler-operator-bundle" = "registry.redhat.io/openshift-secondary-scheduler-operator/secondary-scheduler-operator-bundle"
+"openshift-secondary-scheduler-operator/secondary-scheduler-operator-rhel8" = "registry.access.redhat.com/openshift-secondary-scheduler-operator/secondary-scheduler-operator-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-cleanup-rhel8" = "registry.redhat.io/openshift-serverless-1/eventing-kafka-channel-cleanup-rhel8"
+"openshift-serverless-1/eventing-kafka-broker-controller-rhel8" = "registry.redhat.io/openshift-serverless-1/eventing-kafka-broker-controller-rhel8"
+"openshift-serverless-1/eventing-kafka-broker-dispatcher-rhel8" = "registry.redhat.io/openshift-serverless-1/eventing-kafka-broker-dispatcher-rhel8"
+"openshift-serverless-1/eventing-kafka-broker-post-install-rhel8" = "registry.redhat.io/openshift-serverless-1/eventing-kafka-broker-post-install-rhel8"
+"openshift-serverless-1/eventing-kafka-broker-webhook-rhel8" = "registry.redhat.io/openshift-serverless-1/eventing-kafka-broker-webhook-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"
@@ -1815,7 +1988,6 @@
 "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"
@@ -1894,15 +2066,16 @@
 "pachyderm/pgbouncer" = "registry.connect.redhat.com/pachyderm/pgbouncer"
 "pachyderm/worker" = "registry.connect.redhat.com/pachyderm/worker"
 "paloalto/not-applicable" = "registry.connect.redhat.com/paloalto/not-applicable"
+"paloalto/pcc-operator" = "registry.connect.redhat.com/paloalto/pcc-operator"
 "perceptilabs/perceptilabs-core-1" = "registry.connect.redhat.com/perceptilabs/perceptilabs-core-1"
 "perceptilabs/perceptilabs-frontend-1" = "registry.connect.redhat.com/perceptilabs/perceptilabs-frontend-1"
 "perceptilabs/perceptilabs-operator-bundle" = "registry.connect.redhat.com/perceptilabs/perceptilabs-operator-bundle"
 "perceptilabs/perceptilabs-operator" = "registry.connect.redhat.com/perceptilabs/perceptilabs-operator"
 "perceptilabs/perceptilabs-rygg-1" = "registry.connect.redhat.com/perceptilabs/perceptilabs-rygg-1"
-"percona/percona-postgresql-operator-bundle-marketplace" = "registry.redhat.io/percona/percona-postgresql-operator-bundle-marketplace"
+"percona/percona-postgresql-operator-bundle-marketplace" = "registry.connect.redhat.com/percona/percona-postgresql-operator-bundle-marketplace"
 "percona/percona-postgresql-operator-bundle" = "registry.connect.redhat.com/percona/percona-postgresql-operator-bundle"
-"percona/percona-postgresql-operator-containers" = "registry.redhat.io/percona/percona-postgresql-operator-containers"
-"percona/percona-postgresql-operator" = "registry.redhat.io/percona/percona-postgresql-operator"
+"percona/percona-postgresql-operator-containers" = "registry.connect.redhat.com/percona/percona-postgresql-operator-containers"
+"percona/percona-postgresql-operator" = "registry.connect.redhat.com/percona/percona-postgresql-operator"
 "percona/percona-server-mongodb-operator-bundle" = "registry.redhat.io/percona/percona-server-mongodb-operator-bundle"
 "percona/percona-server-mongodb-operator-bundle-rhmp" = "registry.connect.redhat.com/percona/percona-server-mongodb-operator-bundle-rhmp"
 "percona/percona-xtradb-cluster-operator-bundle-rhmp" = "registry.connect.redhat.com/percona/percona-xtradb-cluster-operator-bundle-rhmp"
@@ -1926,6 +2099,7 @@
 "prajyor925/external-repo" = "quay.io/prajyor925/external-repo"
 "primekey/ejbca-ce" = "registry.redhat.io/primekey/ejbca-ce"
 "prismacloud/compute-console-operator" = "registry.connect.redhat.com/prismacloud/compute-console-operator"
+"prod1611updated/outprod16111" = "registry.connect.redhat.com/prod1611updated/outprod16111"
 "prophetstor/alameda-admission-ubi" = "registry.connect.redhat.com/prophetstor/alameda-admission-ubi"
 "prophetstor/alameda-ai-dispatcher" = "registry.connect.redhat.com/prophetstor/alameda-ai-dispatcher"
 "prophetstor/alameda-ai" = "registry.connect.redhat.com/prophetstor/alameda-ai"
@@ -1960,7 +2134,7 @@
 "purestorage/openstack-cinder-volume-pure-rhosp-16-1" = "registry.connect.redhat.com/purestorage/openstack-cinder-volume-pure-rhosp-16-1"
 "purestorage/openstack-cinder-volume-pure-rhosp-16-2" = "registry.connect.redhat.com/purestorage/openstack-cinder-volume-pure-rhosp-16-2"
 "purestorage/openstack-cinder-volume-pure-rhosp-16" = "registry.connect.redhat.com/purestorage/openstack-cinder-volume-pure-rhosp-16"
-"quarkus/mandrel-21-rhel8" = "registry.redhat.io/quarkus/mandrel-21-rhel8"
+"quarkus/mandrel-21-rhel8" = "registry.access.redhat.com/quarkus/mandrel-21-rhel8"
 "quay/clair-rhel8" = "registry.redhat.io/quay/clair-rhel8"
 "quay/quay-bridge-operator-bundle" = "registry.redhat.io/quay/quay-bridge-operator-bundle"
 "quay/quay-bridge-operator-rhel8" = "registry.redhat.io/quay/quay-bridge-operator-rhel8"
@@ -1976,19 +2150,17 @@
 "r-5fb43bf5b46414d7de2ad0c6" = "registry.redhat.io/r-5fb43bf5b46414d7de2ad0c6"
 "r-6026254a10da100e68ccee28" = "quay.io/r-6026254a10da100e68ccee28"
 "r-602625a710da100e68ccee29" = "quay.io/r-602625a710da100e68ccee29"
-"r-615b92a3f14158265cab81cf" = "quay.io/r-615b92a3f14158265cab81cf"
-"r-615d2cab466de66fed5066b9" = "quay.io/r-615d2cab466de66fed5066b9"
-"r-615d2ce5e2608a5d485d96db" = "quay.io/r-615d2ce5e2608a5d485d96db"
-"r-619bf9a472fcd1d92913ea38" = "quay.io/r-619bf9a472fcd1d92913ea38"
 "r-61dd6d33377742def7df0cba" = "quay.io/r-61dd6d33377742def7df0cba"
 "r-61deecd49593409b3d9e2f56" = "quay.io/r-61deecd49593409b3d9e2f56"
-"r-61ef991a21dd58e81728e2de" = "quay.io/r-61ef991a21dd58e81728e2de"
+"r6security/phoenix-operator" = "registry.connect.redhat.com/r6security/phoenix-operator"
+"randoli/app-director-operator" = "registry.connect.redhat.com/randoli/app-director-operator"
+"randoli/app-director" = "registry.connect.redhat.com/randoli/app-director"
 "realmethods/realmethods12" = "registry.redhat.io/realmethods/realmethods12"
 "realmethods/realmethods-operator-12" = "registry.connect.redhat.com/realmethods/realmethods-operator-12"
+"rebaca/abot-rabbitmq-ubi8" = "registry.connect.redhat.com/rebaca/abot-rabbitmq-ubi8"
+"rebaca/abot-tcpdump" = "registry.connect.redhat.com/rebaca/abot-tcpdump"
 "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/atiwary-rhel7" = "registry.connect.redhat.com/redhat-sp/atiwary-rhel7"
-"redhat-sp/repo-test-prod" = "registry.connect.redhat.com/redhat-sp/repo-test-prod"
 "redislabs/alpha" = "registry.connect.redhat.com/redislabs/alpha"
 "redislabs/gesher" = "registry.connect.redhat.com/redislabs/gesher"
 "redislabs/redis-enterprise-operator-bundle-marketplace" = "registry.connect.redhat.com/redislabs/redis-enterprise-operator-bundle-marketplace"
@@ -2004,9 +2176,14 @@
 "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/acm-cluster-proxy-rhel8" = "registry.redhat.io/rhacm2/acm-cluster-proxy-rhel8"
 "rhacm2/acmesolver-rhel8" = "registry.redhat.io/rhacm2/acmesolver-rhel8"
+"rhacm2/acm-governance-policy-addon-controller-rhel8" = "registry.redhat.io/rhacm2/acm-governance-policy-addon-controller-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/acm-prometheus-config-reloader-rhel8" = "registry.redhat.io/rhacm2/acm-prometheus-config-reloader-rhel8"
+"rhacm2/acm-prometheus-rhel8" = "registry.redhat.io/rhacm2/acm-prometheus-rhel8"
+"rhacm2/acm-volsync-addon-controller-rhel8" = "registry.redhat.io/rhacm2/acm-volsync-addon-controller-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-image-service-rhel8" = "registry.redhat.io/rhacm2/assisted-image-service-rhel8"
@@ -2051,6 +2228,8 @@
 "rhacm2/kube-rbac-proxy-rhel8" = "registry.redhat.io/rhacm2/kube-rbac-proxy-rhel8"
 "rhacm2/kube-state-metrics-rhel8" = "registry.redhat.io/rhacm2/kube-state-metrics-rhel8"
 "rhacm2/kui-web-terminal-rhel8" = "registry.redhat.io/rhacm2/kui-web-terminal-rhel8"
+"rhacm2/lighthouse-agent-rhel8" = "registry.redhat.io/rhacm2/lighthouse-agent-rhel8"
+"rhacm2/lighthouse-coredns-rhel8" = "registry.redhat.io/rhacm2/lighthouse-coredns-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/management-ingress-rhel8" = "registry.redhat.io/rhacm2/management-ingress-rhel8"
@@ -2090,7 +2269,14 @@
 "rhacm2/search-collector-rhel8" = "registry.redhat.io/rhacm2/search-collector-rhel8"
 "rhacm2/search-rhel8" = "registry.redhat.io/rhacm2/search-rhel8"
 "rhacm2/search-ui-rhel8" = "registry.redhat.io/rhacm2/search-ui-rhel8"
+"rhacm2/subctl-rhel8" = "registry.redhat.io/rhacm2/subctl-rhel8"
 "rhacm2/submariner-addon-rhel8" = "registry.redhat.io/rhacm2/submariner-addon-rhel8"
+"rhacm2/submariner-gateway-rhel8" = "registry.redhat.io/rhacm2/submariner-gateway-rhel8"
+"rhacm2/submariner-globalnet-rhel8" = "registry.redhat.io/rhacm2/submariner-globalnet-rhel8"
+"rhacm2/submariner-networkplugin-syncer-rhel8" = "registry.redhat.io/rhacm2/submariner-networkplugin-syncer-rhel8"
+"rhacm2/submariner-operator-bundle" = "registry.redhat.io/rhacm2/submariner-operator-bundle"
+"rhacm2/submariner-rhel8-operator" = "registry.redhat.io/rhacm2/submariner-rhel8-operator"
+"rhacm2/submariner-route-agent-rhel8" = "registry.redhat.io/rhacm2/submariner-route-agent-rhel8"
 "rhacm2/thanos-receive-controller-rhel8" = "registry.redhat.io/rhacm2/thanos-receive-controller-rhel8"
 "rhacm2/thanos-rhel7" = "registry.redhat.io/rhacm2/thanos-rhel7"
 "rhacm2/thanos-rhel8" = "registry.redhat.io/rhacm2/thanos-rhel8"
@@ -2102,6 +2288,7 @@
 "rh-acs/collector" = "registry.redhat.io/rh-acs/collector"
 "rhceph/ansible-runner" = "registry.redhat.io/rhceph/ansible-runner"
 "rhceph/ansible-runner-rhel8" = "registry.redhat.io/rhceph/ansible-runner-rhel8"
+"rhceph/keepalived-rhel8" = "registry.redhat.io/rhceph/keepalived-rhel8"
 "rhceph/rhceph-2-rhel7" = "registry.access.redhat.com/rhceph/rhceph-2-rhel7"
 "rhceph/rhceph-3-dashboard-rhel7" = "registry.access.redhat.com/rhceph/rhceph-3-dashboard-rhel7"
 "rhceph/rhceph-3-rhel7" = "registry.access.redhat.com/rhceph/rhceph-3-rhel7"
@@ -2109,6 +2296,8 @@
 "rhceph/rhceph-4-rhel8" = "registry.redhat.io/rhceph/rhceph-4-rhel8"
 "rhceph/rhceph-5-dashboard-rhel8" = "registry.redhat.io/rhceph/rhceph-5-dashboard-rhel8"
 "rhceph/rhceph-5-rhel8" = "registry.redhat.io/rhceph/rhceph-5-rhel8"
+"rhceph/rhceph-haproxy-rhel8" = "registry.redhat.io/rhceph/rhceph-haproxy-rhel8"
+"rhceph/snmp-notifier-rhel8" = "registry.redhat.io/rhceph/snmp-notifier-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"
@@ -2134,10 +2323,9 @@
 "rhel7/sssd" = "registry.access.redhat.com/rhel7/sssd"
 "rhel7/support-tools" = "registry.access.redhat.com/rhel7/support-tools"
 "rhel8/buildah" = "registry.redhat.io/rhel8/buildah"
+"rhel8/cups" = "registry.redhat.io/rhel8/cups"
 "rhel8/dotnet-31" = "registry.redhat.io/rhel8/dotnet-31"
 "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/dotnet-60" = "registry.redhat.io/rhel8/dotnet-60"
 "rhel8/dotnet-60-runtime" = "registry.redhat.io/rhel8/dotnet-60-runtime"
 "rhel8/flatpak-runtime" = "registry.redhat.io/rhel8/flatpak-runtime"
@@ -2152,7 +2340,6 @@
 "rhel8/memcached" = "registry.redhat.io/rhel8/memcached"
 "rhel8/mysql-80" = "registry.redhat.io/rhel8/mysql-80"
 "rhel8/net-snmp" = "registry.redhat.io/rhel8/net-snmp"
-"rhel8/nginx-116" = "registry.redhat.io/rhel8/nginx-116"
 "rhel8/nginx-118" = "registry.redhat.io/rhel8/nginx-118"
 "rhel8/nginx-120" = "registry.redhat.io/rhel8/nginx-120"
 "rhel8/nodejs-12" = "registry.redhat.io/rhel8/nodejs-12"
@@ -2160,11 +2347,14 @@
 "rhel8/nodejs-14" = "registry.redhat.io/rhel8/nodejs-14"
 "rhel8/nodejs-16-minimal" = "registry.redhat.io/rhel8/nodejs-16-minimal"
 "rhel8/nodejs-16" = "registry.redhat.io/rhel8/nodejs-16"
+"rhel8/openssl" = "registry.redhat.io/rhel8/openssl"
 "rhel8/pause" = "registry.redhat.io/rhel8/pause"
 "rhel8/pcp" = "registry.redhat.io/rhel8/pcp"
 "rhel8/perl-526" = "registry.redhat.io/rhel8/perl-526"
 "rhel8/perl-530" = "registry.redhat.io/rhel8/perl-530"
+"rhel8/perl-532" = "registry.redhat.io/rhel8/perl-532"
 "rhel8/php-74" = "registry.redhat.io/rhel8/php-74"
+"rhel8/php-80" = "registry.redhat.io/rhel8/php-80"
 "rhel8/podman" = "registry.redhat.io/rhel8/podman"
 "rhel8/postgresql-10" = "registry.redhat.io/rhel8/postgresql-10"
 "rhel8/postgresql-12" = "registry.redhat.io/rhel8/postgresql-12"
@@ -2173,7 +2363,6 @@
 "rhel8/python-36" = "registry.redhat.io/rhel8/python-36"
 "rhel8/python-38" = "registry.redhat.io/rhel8/python-38"
 "rhel8/python-39" = "registry.redhat.io/rhel8/python-39"
-"rhel8/redis-5" = "registry.redhat.io/rhel8/redis-5"
 "rhel8/redis-6" = "registry.redhat.io/rhel8/redis-6"
 "rhel8/rhel-guest-image" = "registry.redhat.io/rhel8/rhel-guest-image"
 "rhel8/rsyslog" = "registry.redhat.io/rhel8/rsyslog"
@@ -2181,13 +2370,44 @@
 "rhel8/ruby-26" = "registry.redhat.io/rhel8/ruby-26"
 "rhel8/ruby-27" = "registry.redhat.io/rhel8/ruby-27"
 "rhel8/ruby-30" = "registry.redhat.io/rhel8/ruby-30"
+"rhel8/ruby-31" = "registry.redhat.io/rhel8/ruby-31"
 "rhel8/s2i-base" = "registry.redhat.io/rhel8/s2i-base"
 "rhel8/s2i-core" = "registry.redhat.io/rhel8/s2i-core"
 "rhel8/skopeo" = "registry.redhat.io/rhel8/skopeo"
 "rhel8/support-tools" = "registry.redhat.io/rhel8/support-tools"
 "rhel8/varnish-6" = "registry.redhat.io/rhel8/varnish-6"
-"rhel9-0-els/rhel" = "registry.redhat.io/rhel9-0-els/rhel"
+"rhel9/buildah" = "registry.redhat.io/rhel9/buildah"
 "rhel9/cups" = "registry.redhat.io/rhel9/cups"
+"rhel9/flatpak-runtime" = "registry.redhat.io/rhel9/flatpak-runtime"
+"rhel9/flatpak-sdk" = "registry.redhat.io/rhel9/flatpak-sdk"
+"rhel9/go-toolset" = "registry.redhat.io/rhel9/go-toolset"
+"rhel9/grafana" = "registry.redhat.io/rhel9/grafana"
+"rhel9/httpd-24" = "registry.redhat.io/rhel9/httpd-24"
+"rhel9/mariadb-105" = "registry.redhat.io/rhel9/mariadb-105"
+"rhel9/memcached" = "registry.redhat.io/rhel9/memcached"
+"rhel9/mysql-80" = "registry.redhat.io/rhel9/mysql-80"
+"rhel9/net-snmp" = "registry.redhat.io/rhel9/net-snmp"
+"rhel9/nginx-120" = "registry.redhat.io/rhel9/nginx-120"
+"rhel9/nodejs-16-minimal" = "registry.redhat.io/rhel9/nodejs-16-minimal"
+"rhel9/nodejs-16" = "registry.redhat.io/rhel9/nodejs-16"
+"rhel9/openssl" = "registry.redhat.io/rhel9/openssl"
+"rhel9/pause" = "registry.redhat.io/rhel9/pause"
+"rhel9/pcp" = "registry.redhat.io/rhel9/pcp"
+"rhel9/perl-532" = "registry.redhat.io/rhel9/perl-532"
+"rhel9/php-80" = "registry.redhat.io/rhel9/php-80"
+"rhel9/podman" = "registry.redhat.io/rhel9/podman"
+"rhel9/postgresql-13" = "registry.redhat.io/rhel9/postgresql-13"
+"rhel9/python-39" = "registry.redhat.io/rhel9/python-39"
+"rhel9/redis-6" = "registry.redhat.io/rhel9/redis-6"
+"rhel9/rhel-guest-image" = "registry.redhat.io/rhel9/rhel-guest-image"
+"rhel9/rsyslog" = "registry.redhat.io/rhel9/rsyslog"
+"rhel9/ruby-30" = "registry.redhat.io/rhel9/ruby-30"
+"rhel9/s2i-base" = "registry.redhat.io/rhel9/s2i-base"
+"rhel9/s2i-core" = "registry.redhat.io/rhel9/s2i-core"
+"rhel9/skopeo" = "registry.redhat.io/rhel9/skopeo"
+"rhel9/support-tools" = "registry.redhat.io/rhel9/support-tools"
+"rhel9/tang" = "registry.redhat.io/rhel9/tang"
+"rhel9/varnish-6" = "registry.redhat.io/rhel9/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"
@@ -2229,6 +2449,9 @@
 "rhmtc/openshift-migration-velero-restic-restore-helper-rhel8" = "registry.redhat.io/rhmtc/openshift-migration-velero-restic-restore-helper-rhel8"
 "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"
+"rhn_support_aurne/test_aish_prod" = "quay.io/rhn_support_aurne/test_aish_prod"
+"rhn_support_aurne/test_aish" = "registry.redhat.io/rhn_support_aurne/test_aish"
+"rhn_support_gsanwal/repo-external-rhel9" = "quay.io/rhn_support_gsanwal/repo-external-rhel9"
 "rhoar-nodejs/nodejs-12-rhel7" = "registry.redhat.io/rhoar-nodejs/nodejs-12-rhel7"
 "rhosdt/jaeger-agent-rhel8" = "registry.access.redhat.com/rhosdt/jaeger-agent-rhel8"
 "rhosdt/jaeger-all-in-one-rhel8" = "registry.access.redhat.com/rhosdt/jaeger-all-in-one-rhel8"
@@ -2502,9 +2725,7 @@
 "rhscl/ruby-30-rhel7" = "registry.redhat.io/rhscl/ruby-30-rhel7"
 "rhscl/s2i-base-rhel7" = "registry.access.redhat.com/rhscl/s2i-base-rhel7"
 "rhscl/s2i-core-rhel7" = "registry.access.redhat.com/rhscl/s2i-core-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"
-"rh-sso-7/sso75-openj9-openshift-rhel8" = "registry.redhat.io/rh-sso-7/sso75-openj9-openshift-rhel8"
+"rhscl/varnish-6-rhel7" = "registry.access.redhat.com/rhscl/varnish-6-rhel7"
 "rh-sso-7/sso75-openshift-rhel8" = "registry.redhat.io/rh-sso-7/sso75-openshift-rhel8"
 "rh-sso-7/sso7-rhel8-init-container" = "registry.redhat.io/rh-sso-7/sso7-rhel8-init-container"
 "rh-sso-7/sso7-rhel8-operator-bundle" = "registry.redhat.io/rh-sso-7/sso7-rhel8-operator-bundle"
@@ -2512,11 +2733,12 @@
 "robinio/robin-operator" = "registry.redhat.io/robinio/robin-operator"
 "robinio/robin-storage-enterprise" = "registry.connect.redhat.com/robinio/robin-storage-enterprise"
 "robinio/robin-storage-express" = "registry.connect.redhat.com/robinio/robin-storage-express"
-"robinio/robin-storage" = "registry.redhat.io/robinio/robin-storage"
+"robinio/robin-storage" = "registry.connect.redhat.com/robinio/robin-storage"
 "robinio/robin-storage-trial" = "registry.connect.redhat.com/robinio/robin-storage-trial"
 "rocketchat/rocketchat-apb" = "registry.connect.redhat.com/rocketchat/rocketchat-apb"
 "rocketchat/rocketchat-operator-bundle" = "registry.connect.redhat.com/rocketchat/rocketchat-operator-bundle"
 "rocketchat/rocketchat" = "registry.connect.redhat.com/rocketchat/rocketchat"
+"rookout/rookout-k8s-operator" = "registry.redhat.io/rookout/rookout-k8s-operator"
 "runai/runai-operator" = "registry.connect.redhat.com/runai/runai-operator"
 "scaleout/stateserver" = "registry.connect.redhat.com/scaleout/stateserver"
 "scality/swift-scality-backend" = "registry.connect.redhat.com/scality/swift-scality-backend"
@@ -2559,6 +2781,7 @@
 "senseforth/ai-chatbot" = "registry.connect.redhat.com/senseforth/ai-chatbot"
 "sensu/sensu" = "registry.connect.redhat.com/sensu/sensu"
 "signalfx-inc/smart-agent" = "registry.connect.redhat.com/signalfx-inc/smart-agent"
+"silicomltd/silicom-sts-operator" = "registry.redhat.io/silicomltd/silicom-sts-operator"
 "sixfusion/openshift-collector1" = "registry.connect.redhat.com/sixfusion/openshift-collector1"
 "slcorp/rtview-dataserver" = "registry.connect.redhat.com/slcorp/rtview-dataserver"
 "smilecdr/smilecdr" = "registry.connect.redhat.com/smilecdr/smilecdr"
@@ -2570,6 +2793,7 @@
 "sonatype/nexus-iq-server" = "registry.redhat.io/sonatype/nexus-iq-server"
 "sonatype/nexus-repository-manager" = "registry.connect.redhat.com/sonatype/nexus-repository-manager"
 "splunk/sck101" = "registry.connect.redhat.com/splunk/sck101"
+"stakater/tenant-operator-0" = "registry.connect.redhat.com/stakater/tenant-operator-0"
 "stakater/tenant-operator" = "registry.connect.redhat.com/stakater/tenant-operator"
 "starburst/hive" = "registry.connect.redhat.com/starburst/hive"
 "starburst/presto-init" = "registry.connect.redhat.com/starburst/presto-init"
@@ -2612,10 +2836,11 @@
 "storware/vprotect-operator-bundle" = "registry.connect.redhat.com/storware/vprotect-operator-bundle"
 "storware/vprotect-operator" = "registry.connect.redhat.com/storware/vprotect-operator"
 "storware/vprotect-server" = "registry.connect.redhat.com/storware/vprotect-server"
-"sumologic/sumologic-kubernetes-collection-helm-operator-bundle" = "registry.redhat.io/sumologic/sumologic-kubernetes-collection-helm-operator-bundle"
+"sumologic/sumologic-kubernetes-collection-helm-operator-bundle" = "registry.connect.redhat.com/sumologic/sumologic-kubernetes-collection-helm-operator-bundle"
 "sumologic/sumologic-kubernetes-collection-helm-operator" = "registry.connect.redhat.com/sumologic/sumologic-kubernetes-collection-helm-operator"
 "sysdig/agent" = "registry.connect.redhat.com/sysdig/agent"
 "sysdig/sysdig-operator-bundle" = "registry.connect.redhat.com/sysdig/sysdig-operator-bundle"
+"sysdig/sysdig-operator" = "registry.redhat.io/sysdig/sysdig-operator"
 "thalescpl/lunaclient" = "registry.redhat.io/thalescpl/lunaclient"
 "thestormforge/optimize-controller-ubi8" = "registry.connect.redhat.com/thestormforge/optimize-controller-ubi8"
 "thestormforge/stormforge-optimize" = "registry.connect.redhat.com/thestormforge/stormforge-optimize"
@@ -2624,8 +2849,9 @@
 "tmax/jeus7-0-0-5-das-openshift" = "registry.connect.redhat.com/tmax/jeus7-0-0-5-das-openshift"
 "tmax/jeus8-0-0-0-das-openshift" = "registry.connect.redhat.com/tmax/jeus8-0-0-0-das-openshift"
 "tmax/tibero6-06-openshift" = "registry.connect.redhat.com/tmax/tibero6-06-openshift"
+"tonyfieit/quai" = "registry.connect.redhat.com/tonyfieit/quai"
 "tremolosecurity/activemq" = "registry.connect.redhat.com/tremolosecurity/activemq"
-"tremolosecurity/openunison-operator-bundle" = "registry.connect.redhat.com/tremolosecurity/openunison-operator-bundle"
+"tremolosecurity/openunison-operator-bundle" = "registry.redhat.io/tremolosecurity/openunison-operator-bundle"
 "tremolosecurity/openunison-operator" = "registry.redhat.io/tremolosecurity/openunison-operator"
 "tremolosecurity/openunison-s2i-10" = "registry.connect.redhat.com/tremolosecurity/openunison-s2i-10"
 "tremolosecurity/unison-10" = "registry.connect.redhat.com/tremolosecurity/unison-10"
@@ -2643,6 +2869,7 @@
 "trilio/dex" = "registry.connect.redhat.com/trilio/dex"
 "trilio/hook-executor" = "registry.connect.redhat.com/trilio/hook-executor"
 "trilio/ingress-controller" = "registry.connect.redhat.com/trilio/ingress-controller"
+"trilio/k8s-triliovault-ibm" = "registry.connect.redhat.com/trilio/k8s-triliovault-ibm"
 "trilio/metamover" = "registry.connect.redhat.com/trilio/metamover"
 "trilio/minio" = "registry.connect.redhat.com/trilio/minio"
 "trilio/target-browser" = "registry.connect.redhat.com/trilio/target-browser"
@@ -2678,11 +2905,11 @@
 "turbonomic/mediation-acims" = "registry.connect.redhat.com/turbonomic/mediation-acims"
 "turbonomic/mediation-actionscript" = "registry.connect.redhat.com/turbonomic/mediation-actionscript"
 "turbonomic/mediation-actionstream-kafka" = "registry.connect.redhat.com/turbonomic/mediation-actionstream-kafka"
-"turbonomic/mediation-aix" = "registry.connect.redhat.com/turbonomic/mediation-aix"
 "turbonomic/mediation-apic" = "registry.connect.redhat.com/turbonomic/mediation-apic"
 "turbonomic/mediation-appdynamics" = "registry.connect.redhat.com/turbonomic/mediation-appdynamics"
 "turbonomic/mediation-appinsights" = "registry.connect.redhat.com/turbonomic/mediation-appinsights"
 "turbonomic/mediation-awsbilling" = "registry.connect.redhat.com/turbonomic/mediation-awsbilling"
+"turbonomic/mediation-awscloudbilling" = "registry.redhat.io/turbonomic/mediation-awscloudbilling"
 "turbonomic/mediation-awscost" = "registry.connect.redhat.com/turbonomic/mediation-awscost"
 "turbonomic/mediation-awslambda" = "registry.connect.redhat.com/turbonomic/mediation-awslambda"
 "turbonomic/mediation-aws" = "registry.connect.redhat.com/turbonomic/mediation-aws"
@@ -2692,14 +2919,13 @@
 "turbonomic/mediation-azuresp" = "registry.connect.redhat.com/turbonomic/mediation-azuresp"
 "turbonomic/mediation-azurevolumes" = "registry.connect.redhat.com/turbonomic/mediation-azurevolumes"
 "turbonomic/mediation-baremetal" = "registry.connect.redhat.com/turbonomic/mediation-baremetal"
-"turbonomic/mediation-cloudfoundry" = "registry.connect.redhat.com/turbonomic/mediation-cloudfoundry"
 "turbonomic/mediation-compellent" = "registry.connect.redhat.com/turbonomic/mediation-compellent"
 "turbonomic/mediation-datadog" = "registry.connect.redhat.com/turbonomic/mediation-datadog"
 "turbonomic/mediation-dynatrace" = "registry.connect.redhat.com/turbonomic/mediation-dynatrace"
+"turbonomic/mediation-flexera" = "registry.connect.redhat.com/turbonomic/mediation-flexera"
 "turbonomic/mediation-gcpbilling" = "registry.connect.redhat.com/turbonomic/mediation-gcpbilling"
 "turbonomic/mediation-gcpcost" = "registry.connect.redhat.com/turbonomic/mediation-gcpcost"
 "turbonomic/mediation-gcpproject" = "registry.redhat.io/turbonomic/mediation-gcpproject"
-"turbonomic/mediation-gcp" = "registry.connect.redhat.com/turbonomic/mediation-gcp"
 "turbonomic/mediation-gcpsa" = "registry.connect.redhat.com/turbonomic/mediation-gcpsa"
 "turbonomic/mediation-hds" = "registry.connect.redhat.com/turbonomic/mediation-hds"
 "turbonomic/mediation-horizon" = "registry.connect.redhat.com/turbonomic/mediation-horizon"
@@ -2721,26 +2947,25 @@
 "turbonomic/mediation-newrelic" = "registry.connect.redhat.com/turbonomic/mediation-newrelic"
 "turbonomic/mediation-nutanix" = "registry.connect.redhat.com/turbonomic/mediation-nutanix"
 "turbonomic/mediation-oneview" = "registry.connect.redhat.com/turbonomic/mediation-oneview"
-"turbonomic/mediation-openstack" = "registry.connect.redhat.com/turbonomic/mediation-openstack"
 "turbonomic/mediation-oracle" = "registry.connect.redhat.com/turbonomic/mediation-oracle"
-"turbonomic/mediation-pivotal" = "registry.connect.redhat.com/turbonomic/mediation-pivotal"
 "turbonomic/mediation-pure" = "registry.connect.redhat.com/turbonomic/mediation-pure"
 "turbonomic/mediation-rhv" = "registry.connect.redhat.com/turbonomic/mediation-rhv"
 "turbonomic/mediation-scaleio" = "registry.connect.redhat.com/turbonomic/mediation-scaleio"
 "turbonomic/mediation-servicenow" = "registry.connect.redhat.com/turbonomic/mediation-servicenow"
 "turbonomic/mediation-snmp" = "registry.connect.redhat.com/turbonomic/mediation-snmp"
+"turbonomic/mediation-tanium" = "registry.connect.redhat.com/turbonomic/mediation-tanium"
 "turbonomic/mediation-terraform" = "registry.connect.redhat.com/turbonomic/mediation-terraform"
 "turbonomic/mediation-tetration" = "registry.connect.redhat.com/turbonomic/mediation-tetration"
 "turbonomic/mediation-tomcat" = "registry.connect.redhat.com/turbonomic/mediation-tomcat"
 "turbonomic/mediation-ucsdirector" = "registry.connect.redhat.com/turbonomic/mediation-ucsdirector"
 "turbonomic/mediation-ucs" = "registry.connect.redhat.com/turbonomic/mediation-ucs"
 "turbonomic/mediation-udt" = "registry.connect.redhat.com/turbonomic/mediation-udt"
-"turbonomic/mediation-vcd" = "registry.connect.redhat.com/turbonomic/mediation-vcd"
 "turbonomic/mediation-vcenterbrowsing" = "registry.connect.redhat.com/turbonomic/mediation-vcenterbrowsing"
 "turbonomic/mediation-vcenter" = "registry.connect.redhat.com/turbonomic/mediation-vcenter"
 "turbonomic/mediation-vmax" = "registry.connect.redhat.com/turbonomic/mediation-vmax"
 "turbonomic/mediation-vmm" = "registry.connect.redhat.com/turbonomic/mediation-vmm"
 "turbonomic/mediation-vplex" = "registry.connect.redhat.com/turbonomic/mediation-vplex"
+"turbonomic/mediation-webhook" = "registry.connect.redhat.com/turbonomic/mediation-webhook"
 "turbonomic/mediation-weblogic" = "registry.connect.redhat.com/turbonomic/mediation-weblogic"
 "turbonomic/mediation-websphere" = "registry.connect.redhat.com/turbonomic/mediation-websphere"
 "turbonomic/mediation-wmi" = "registry.connect.redhat.com/turbonomic/mediation-wmi"
@@ -2748,7 +2973,7 @@
 "turbonomic/mediation-xtremio" = "registry.connect.redhat.com/turbonomic/mediation-xtremio"
 "turbonomic/nginx" = "registry.connect.redhat.com/turbonomic/nginx"
 "turbonomic/plan-orchestrator" = "registry.connect.redhat.com/turbonomic/plan-orchestrator"
-"turbonomic/prometurbo-operator" = "registry.connect.redhat.com/turbonomic/prometurbo-operator"
+"turbonomic/prometurbo-operator-bundle" = "registry.connect.redhat.com/turbonomic/prometurbo-operator-bundle"
 "turbonomic/prometurbo" = "registry.redhat.io/turbonomic/prometurbo"
 "turbonomic/repository" = "registry.connect.redhat.com/turbonomic/repository"
 "turbonomic/rsyslog" = "registry.connect.redhat.com/turbonomic/rsyslog"
@@ -2762,7 +2987,7 @@
 "ubi7-init" = "registry.redhat.io/ubi7-init"
 "ubi7-minimal" = "registry.access.redhat.com/ubi7-minimal"
 "ubi7/nginx-118" = "registry.access.redhat.com/ubi7/nginx-118"
-"ubi7/nginx-120" = "registry.redhat.io/ubi7/nginx-120"
+"ubi7/nginx-120" = "registry.access.redhat.com/ubi7/nginx-120"
 "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"
@@ -2780,8 +3005,6 @@
 "ubi8/buildah" = "registry.access.redhat.com/ubi8/buildah"
 "ubi8/dotnet-31" = "registry.access.redhat.com/ubi8/dotnet-31"
 "ubi8/dotnet-31-runtime" = "registry.access.redhat.com/ubi8/dotnet-31-runtime"
-"ubi8/dotnet-50" = "registry.access.redhat.com/ubi8/dotnet-50"
-"ubi8/dotnet-50-runtime" = "registry.access.redhat.com/ubi8/dotnet-50-runtime"
 "ubi8/dotnet-60" = "registry.access.redhat.com/ubi8/dotnet-60"
 "ubi8/dotnet-60-runtime" = "registry.access.redhat.com/ubi8/dotnet-60-runtime"
 "ubi8/go-toolset" = "registry.redhat.io/ubi8/go-toolset"
@@ -2802,11 +3025,13 @@
 "ubi8/openjdk-17-runtime" = "registry.access.redhat.com/ubi8/openjdk-17-runtime"
 "ubi8/openjdk-8" = "registry.access.redhat.com/ubi8/openjdk-8"
 "ubi8/openjdk-8-runtime" = "registry.access.redhat.com/ubi8/openjdk-8-runtime"
+"ubi8/openssl" = "registry.access.redhat.com/ubi8/openssl"
 "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"
-"ubi8/php-73" = "registry.access.redhat.com/ubi8/php-73"
+"ubi8/perl-532" = "registry.access.redhat.com/ubi8/perl-532"
 "ubi8/php-74" = "registry.access.redhat.com/ubi8/php-74"
+"ubi8/php-80" = "registry.access.redhat.com/ubi8/php-80"
 "ubi8/podman" = "registry.access.redhat.com/ubi8/podman"
 "ubi8/python-27" = "registry.access.redhat.com/ubi8/python-27"
 "ubi8/python-36" = "registry.access.redhat.com/ubi8/python-36"
@@ -2824,6 +3049,30 @@
 "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"
+"ubi9/buildah" = "registry.access.redhat.com/ubi9/buildah"
+"ubi9/go-toolset" = "registry.access.redhat.com/ubi9/go-toolset"
+"ubi9/httpd-24" = "registry.access.redhat.com/ubi9/httpd-24"
+"ubi9-init" = "registry.access.redhat.com/ubi9-init"
+"ubi9-micro" = "registry.access.redhat.com/ubi9-micro"
+"ubi9-minimal" = "registry.access.redhat.com/ubi9-minimal"
+"ubi9/nginx-120" = "registry.access.redhat.com/ubi9/nginx-120"
+"ubi9/nodejs-16-minimal" = "registry.access.redhat.com/ubi9/nodejs-16-minimal"
+"ubi9/nodejs-16" = "registry.access.redhat.com/ubi9/nodejs-16"
+"ubi9/openssl" = "registry.access.redhat.com/ubi9/openssl"
+"ubi9/pause" = "registry.access.redhat.com/ubi9/pause"
+"ubi9/perl-532" = "registry.access.redhat.com/ubi9/perl-532"
+"ubi9/php-80" = "registry.access.redhat.com/ubi9/php-80"
+"ubi9/podman" = "registry.redhat.io/ubi9/podman"
+"ubi9/python-39" = "registry.access.redhat.com/ubi9/python-39"
+"ubi9" = "registry.access.redhat.com/ubi9"
+"ubi9/ruby-30" = "registry.access.redhat.com/ubi9/ruby-30"
+"ubi9/s2i-base" = "registry.access.redhat.com/ubi9/s2i-base"
+"ubi9/s2i-core" = "registry.access.redhat.com/ubi9/s2i-core"
+"ubi9/skopeo" = "registry.access.redhat.com/ubi9/skopeo"
+"ubi9/ubi-init" = "registry.access.redhat.com/ubi9/ubi-init"
+"ubi9/ubi-micro" = "registry.access.redhat.com/ubi9/ubi-micro"
+"ubi9/ubi-minimal" = "registry.access.redhat.com/ubi9/ubi-minimal"
+"ubi9/ubi" = "registry.access.redhat.com/ubi9/ubi"
 "ubixlabs/ubix-operator" = "registry.connect.redhat.com/ubixlabs/ubix-operator"
 "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"
@@ -2834,12 +3083,18 @@
 "veritas-technologies/infoscale-csi-plugin" = "registry.connect.redhat.com/veritas-technologies/infoscale-csi-plugin"
 "veritas-technologies/infoscale-dr-operator" = "registry.connect.redhat.com/veritas-technologies/infoscale-dr-operator"
 "veritas-technologies/infoscale-license" = "registry.connect.redhat.com/veritas-technologies/infoscale-license"
+"veritas-technologies/infoscale-licensing-operator-bundle" = "registry.connect.redhat.com/veritas-technologies/infoscale-licensing-operator-bundle"
 "veritas-technologies/infoscale-operator-bundle" = "registry.redhat.io/veritas-technologies/infoscale-operator-bundle"
 "veritas-technologies/infoscale-operator" = "registry.connect.redhat.com/veritas-technologies/infoscale-operator"
 "veritas-technologies/infoscale" = "registry.connect.redhat.com/veritas-technologies/infoscale"
+"veritas-technologies/infoscale-sds-operator-bundle" = "registry.connect.redhat.com/veritas-technologies/infoscale-sds-operator-bundle"
 "veritas-technologies/infoscale-vxfen" = "registry.connect.redhat.com/veritas-technologies/infoscale-vxfen"
+"veritas-technologies/rhosp-16-1-nbosdm-10-0" = "registry.redhat.io/veritas-technologies/rhosp-16-1-nbosdm-10-0"
+"veritas-technologies/rhosp-16-1-nbosdmapi-10-0" = "registry.connect.redhat.com/veritas-technologies/rhosp-16-1-nbosdmapi-10-0"
+"veritas-technologies/rhosp-16-1-nbos-horizonplugin-10-0" = "registry.connect.redhat.com/veritas-technologies/rhosp-16-1-nbos-horizonplugin-10-0"
 "vfunction/vfunction-mysql" = "registry.connect.redhat.com/vfunction/vfunction-mysql"
 "vfunction/vfunction-nginx" = "registry.connect.redhat.com/vfunction/vfunction-nginx"
+"vfunction/vfunction-server-operator-bundle-marketplace" = "registry.connect.redhat.com/vfunction/vfunction-server-operator-bundle-marketplace"
 "vfunction/vfunction-server-operator-bundle" = "registry.redhat.io/vfunction/vfunction-server-operator-bundle"
 "vfunction/vfunction-server-operator" = "registry.connect.redhat.com/vfunction/vfunction-server-operator"
 "vfunction/vfunction-storage" = "registry.connect.redhat.com/vfunction/vfunction-storage"
@@ -2848,14 +3103,22 @@
 "vfunction/vfunction-vfapi-organizations" = "registry.connect.redhat.com/vfunction/vfunction-vfapi-organizations"
 "vfunction/vfunction-vfapi-users" = "registry.connect.redhat.com/vfunction/vfunction-vfapi-users"
 "virtuozzo/ploop1" = "registry.connect.redhat.com/virtuozzo/ploop1"
-"vmware-tanzu/vsphere-kubernetes-drivers-operator" = "registry.redhat.io/vmware-tanzu/vsphere-kubernetes-drivers-operator"
 "wavefronthq/antrea-ocp-operator" = "registry.connect.redhat.com/wavefronthq/antrea-ocp-operator"
 "wavefronthq/antrea-openshift-operator" = "registry.redhat.io/wavefronthq/antrea-openshift-operator"
 "wavefronthq/nsx-ncp-operator-bundle" = "registry.connect.redhat.com/wavefronthq/nsx-ncp-operator-bundle"
 "wavefronthq/proxy" = "registry.redhat.io/wavefronthq/proxy"
 "wavefronthq/wavefront-kubernetes-collector" = "registry.connect.redhat.com/wavefronthq/wavefront-kubernetes-collector"
+"web-terminal/web-terminal-exec-rhel8" = "registry.redhat.io/web-terminal/web-terminal-exec-rhel8"
+"web-terminal/web-terminal-rhel8-operator" = "registry.redhat.io/web-terminal/web-terminal-rhel8-operator"
+"web-terminal/web-terminal-tooling-rhel8" = "registry.redhat.io/web-terminal/web-terminal-tooling-rhel8"
+"wmalyk28/cloudnfv-operator-bundle" = "quay.io/wmalyk28/cloudnfv-operator-bundle"
+"workload-availability/node-maintenance-must-gather-rhel8" = "registry.access.redhat.com/workload-availability/node-maintenance-must-gather-rhel8"
+"workload-availability/node-maintenance-operator-bundle" = "registry.access.redhat.com/workload-availability/node-maintenance-operator-bundle"
+"workload-availability/node-maintenance-rhel8-operator" = "registry.access.redhat.com/workload-availability/node-maintenance-rhel8-operator"
+"workload-availability/self-node-remediation-rhel8-operator" = "registry.access.redhat.com/workload-availability/self-node-remediation-rhel8-operator"
 "xebialabs/xl-release" = "registry.connect.redhat.com/xebialabs/xl-release"
 "xsky/xsky-csi-iscsi-driver" = "registry.connect.redhat.com/xsky/xsky-csi-iscsi-driver"
+"xsky/xsky-csi-nfs-driver" = "registry.connect.redhat.com/xsky/xsky-csi-nfs-driver"
 "yash/yashone2" = "registry.connect.redhat.com/yash/yashone2"
 "yugabytedb/yugabyte-platform-operator-bundle" = "registry.connect.redhat.com/yugabytedb/yugabyte-platform-operator-bundle"
 "yugabytedb/yugabyte-platform-operator-image" = "registry.connect.redhat.com/yugabytedb/yugabyte-platform-operator-image"
@@ -2864,8 +3127,10 @@
 "yugabytedb/yugabyte" = "registry.connect.redhat.com/yugabytedb/yugabyte"
 "zabbix/zabbix-agent2-50" = "registry.connect.redhat.com/zabbix/zabbix-agent2-50"
 "zabbix/zabbix-agent2-54" = "registry.connect.redhat.com/zabbix/zabbix-agent2-54"
+"zabbix/zabbix-agent2-60" = "registry.connect.redhat.com/zabbix/zabbix-agent2-60"
 "zabbix/zabbix-agent-50" = "registry.connect.redhat.com/zabbix/zabbix-agent-50"
 "zabbix/zabbix-agent-54" = "registry.connect.redhat.com/zabbix/zabbix-agent-54"
+"zabbix/zabbix-agent-60" = "registry.connect.redhat.com/zabbix/zabbix-agent-60"
 "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-44" = "registry.redhat.io/zabbix/zabbix-appliance-44"
@@ -2873,21 +3138,28 @@
 "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-java-gateway-54" = "registry.connect.redhat.com/zabbix/zabbix-java-gateway-54"
+"zabbix/zabbix-java-gateway-60" = "registry.connect.redhat.com/zabbix/zabbix-java-gateway-60"
 "zabbix/zabbix-operator-certified-44" = "registry.connect.redhat.com/zabbix/zabbix-operator-certified-44"
 "zabbix/zabbixoperator-certified-bundle" = "registry.connect.redhat.com/zabbix/zabbixoperator-certified-bundle"
 "zabbix/zabbixoperator-certified" = "registry.redhat.io/zabbix/zabbixoperator-certified"
 "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-mysql-54" = "registry.connect.redhat.com/zabbix/zabbix-proxy-mysql-54"
+"zabbix/zabbix-proxy-mysql-60" = "registry.connect.redhat.com/zabbix/zabbix-proxy-mysql-60"
 "zabbix/zabbix-proxy-sqlite-50" = "registry.connect.redhat.com/zabbix/zabbix-proxy-sqlite-50"
 "zabbix/zabbix-proxy-sqlite-54" = "registry.connect.redhat.com/zabbix/zabbix-proxy-sqlite-54"
+"zabbix/zabbix-proxy-sqlite-60" = "registry.connect.redhat.com/zabbix/zabbix-proxy-sqlite-60"
 "zabbix/zabbix-server-mysql-50" = "registry.connect.redhat.com/zabbix/zabbix-server-mysql-50"
 "zabbix/zabbix-server-mysql-54" = "registry.connect.redhat.com/zabbix/zabbix-server-mysql-54"
+"zabbix/zabbix-server-mysql-60" = "registry.connect.redhat.com/zabbix/zabbix-server-mysql-60"
 "zabbix/zabbix-snmptraps-50" = "registry.connect.redhat.com/zabbix/zabbix-snmptraps-50"
 "zabbix/zabbix-snmptraps-54" = "registry.connect.redhat.com/zabbix/zabbix-snmptraps-54"
+"zabbix/zabbix-snmptraps-60" = "registry.connect.redhat.com/zabbix/zabbix-snmptraps-60"
 "zabbix/zabbix-web-mysql-44" = "registry.connect.redhat.com/zabbix/zabbix-web-mysql-44"
 "zabbix/zabbix-web-mysql-50" = "registry.connect.redhat.com/zabbix/zabbix-web-mysql-50"
 "zabbix/zabbix-web-mysql-54" = "registry.connect.redhat.com/zabbix/zabbix-web-mysql-54"
-"zabbix/zabbix-web-service-54" = "registry.redhat.io/zabbix/zabbix-web-service-54"
+"zabbix/zabbix-web-mysql-60" = "registry.connect.redhat.com/zabbix/zabbix-web-mysql-60"
+"zabbix/zabbix-web-service-54" = "registry.connect.redhat.com/zabbix/zabbix-web-service-54"
+"zabbix/zabbix-web-service-60" = "registry.connect.redhat.com/zabbix/zabbix-web-service-60"
 "zadara/csi" = "registry.connect.redhat.com/zadara/csi"
 "zts/xcrypt-operator-1-bundle-rhmp" = "registry.connect.redhat.com/zts/xcrypt-operator-1-bundle-rhmp"
diff --git a/SOURCES/Containerfile.5.md b/SOURCES/Containerfile.5.md
new file mode 100644
index 0000000..141e99d
--- /dev/null
+++ b/SOURCES/Containerfile.5.md
@@ -0,0 +1,574 @@
+% "CONTAINERFILE" "5" "Aug 2021" "" "Container User Manuals"
+
+# NAME
+
+Containerfile(Dockerfile) - automate the steps of creating a container image
+
+# INTRODUCTION
+
+The **Containerfile** is a configuration file that automates the steps of creating a container image. It is similar to a Makefile. Container engines (Podman, Buildah, Docker) read instructions from the **Containerfile** to automate the steps otherwise performed manually to create an image. To build an image, create a file called **Containerfile**.
+
+The **Containerfile** describes the steps taken to assemble the image. When the
+**Containerfile** has been created, call the `buildah bud`, `podman build`, `docker build` command,
+using the path of context directory that contains **Containerfile** as the argument. Podman and Buildah default to **Containerfile** and will fall back to **Dockerfile**. Docker only will search for **Dockerfile** in the context directory.
+
+
+**Dockerfile** is an alternate name for the same object.  **Containerfile** and **Dockerfile** support the same syntax.
+
+# SYNOPSIS
+
+INSTRUCTION arguments
+
+For example:
+
+  FROM image
+
+# DESCRIPTION
+
+A Containerfile is a file that automates the steps of creating a container image.
+A Containerfile is similar to a Makefile.
+
+# USAGE
+
+  ```
+  buildah bud .
+  podman build .
+  ```
+
+  -- Runs the steps and commits them, building a final image.
+  The path to the source repository defines where to find the context of the
+  build.
+
+  ```
+  buildah bud -t repository/tag .
+  podman build -t repository/tag .
+  ```
+
+  -- specifies a repository and tag at which to save the new image if the build
+  succeeds. The container engine runs the steps one-by-one, committing the result
+  to a new image if necessary, before finally outputting the ID of the new
+  image.
+
+  Container engines re-use intermediate images whenever possible. This significantly
+  accelerates the *build* process.
+
+# FORMAT
+
+  `FROM image`
+
+  `FROM image:tag`
+
+  `FROM image@digest`
+
+  -- The **FROM** instruction sets the base image for subsequent instructions. A
+  valid Containerfile must have either **ARG** or *FROM** as its first instruction.
+  If **FROM** is not the first instruction in the file, it may only be preceded by
+  one or more ARG instructions, which declare arguments that are used in the next FROM line in the Containerfile.
+  The image can be any valid image. It is easy to start by pulling an image from the public
+  repositories.
+
+  -- **FROM** must appear at least once in the Containerfile.
+
+  -- **FROM** The first **FROM** command must come before all other instructions in
+  the Containerfile except **ARG**
+
+  -- **FROM** may appear multiple times within a single Containerfile in order to create
+  multiple images. Make a note of the last image ID output by the commit before
+  each new **FROM** command.
+
+  -- If no tag is given to the **FROM** instruction, container engines apply the
+  `latest` tag. If the used tag does not exist, an error is returned.
+
+  -- If no digest is given to the **FROM** instruction, container engines apply the
+  `latest` tag. If the used tag does not exist, an error is returned.
+
+**MAINTAINER**
+  -- **MAINTAINER** sets the Author field for the generated images.
+  Useful for providing users with an email or url for support.
+
+**RUN**
+  -- **RUN** has two forms:
+
+  ```
+  # the command is run in a shell - /bin/sh -c
+  RUN <command>
+
+  # Executable form
+  RUN ["executable", "param1", "param2"]
+  ```
+**RUN mounts**
+
+**--mount**=*type=TYPE,TYPE-SPECIFIC-OPTION[,...]*
+
+Attach a filesystem mount to the container
+
+Current supported mount TYPES are bind, cache, secret and tmpfs.
+
+       e.g.
+
+       mount=type=bind,source=/path/on/host,destination=/path/in/container
+
+       mount=type=tmpfs,tmpfs-size=512M,destination=/path/in/container
+
+       mount=type=secret,id=mysecret cat /run/secrets/mysecret
+
+       Common Options:
+
+              · src, source: mount source spec for bind and volume. Mandatory for bind. If `from` is specified, `src` is the subpath in the `from` field.
+
+              · dst, destination, target: mount destination spec.
+
+              · ro, read-only: true or false (default).
+
+       Options specific to bind:
+
+              · bind-propagation: shared, slave, private, rshared, rslave, or rprivate(default). See also mount(2).
+
+              . bind-nonrecursive: do not setup a recursive bind mount.  By default it is recursive.
+
+              · from: stage or image name for the root of the source. Defaults to the build context.
+
+       Options specific to tmpfs:
+
+              · tmpfs-size: Size of the tmpfs mount in bytes. Unlimited by default in Linux.
+
+              · tmpfs-mode: File mode of the tmpfs in octal. (e.g. 700 or 0700.) Defaults to 1777 in Linux.
+
+              · tmpcopyup: Path that is shadowed by the tmpfs mount is recursively copied up to the tmpfs itself.
+
+	Options specific to cache:
+
+              · id: Create a separate cache directory for a particular id.
+
+              · mode: File mode for new cache directory in octal. Default 0755.
+
+              · ro, readonly: read only cache if set.
+
+              · uid: uid for cache directory.
+
+              · gid: gid for cache directory.
+
+              · from: stage name for the root of the source. Defaults to host cache directory.
+
+
+**RUN Secrets**
+
+The RUN command has a feature to allow the passing of secret information into the image build. These secrets files can be used during the RUN command but are not committed to the final image. The `RUN` command supports the `--mount` option to identify the secret file. A secret file from the host is mounted into the container while the image is being built.
+
+Container engines pass secret the secret file into the build using the `--secret` flag.
+
+**--mount**=*type=secret,TYPE-SPECIFIC-OPTION[,...]*
+
+- `id` is the identifier for the secret passed into the `buildah bud --secret` or `podman build --secret`. This identifier is associated with the RUN --mount identifier to use in the Containerfile.
+
+- `dst`|`target`|`destination` rename the secret file to a specific file in the Containerfile RUN command to use.
+
+- `type=secret` tells the --mount command that it is mounting in a secret file
+
+```
+# shows secret from default secret location:
+RUN --mount=type=secret,id=mysecret cat /run/secrets/mysecret
+```
+```
+# shows secret from custom secret location:
+RUN --mount=type=secret,id=mysecret,dst=/foobar cat /foobar
+```
+The secret needs to be passed to the build using the --secret flag. The final image built does not container the secret file:
+
+```
+ buildah bud --no-cache --secret id=mysecret,src=mysecret.txt .
+```
+
+  -- The **RUN** instruction executes any commands in a new layer on top of the current
+  image and commits the results. The committed image is used for the next step in
+  Containerfile.
+
+  -- Layering **RUN** instructions and generating commits conforms to the core
+  concepts of container engines where commits are cheap and containers can be created from
+  any point in the history of an image. This is similar to source control.  The
+  exec form makes it possible to avoid shell string munging. The exec form makes
+  it possible to **RUN** commands using a base image that does not contain `/bin/sh`.
+
+  Note that the exec form is parsed as a JSON array, which means that you must
+  use double-quotes (") around words, not single-quotes (').
+
+**CMD**
+  -- **CMD** has three forms:
+
+  ```
+  # Executable form
+  CMD ["executable", "param1", "param2"]`
+
+  # Provide default arguments to ENTRYPOINT
+  CMD ["param1", "param2"]`
+
+  # the command is run in a shell - /bin/sh -c
+  CMD command param1 param2
+  ```
+
+  -- There should be only one **CMD** in a Containerfile. If more than one **CMD** is listed, only
+  the last **CMD** takes effect.
+  The main purpose of a **CMD** is to provide defaults for an executing container.
+  These defaults may include an executable, or they can omit the executable. If
+  they omit the executable, an **ENTRYPOINT** must be specified.
+  When used in the shell or exec formats, the **CMD** instruction sets the command to
+  be executed when running the image.
+  If you use the shell form of the **CMD**, the `<command>` executes in `/bin/sh -c`:
+
+  Note that the exec form is parsed as a JSON array, which means that you must
+  use double-quotes (") around words, not single-quotes (').
+
+  ```
+  FROM ubuntu
+  CMD echo "This is a test." | wc -
+  ```
+
+  -- If you run **command** without a shell, then you must express the command as a
+  JSON array and give the full path to the executable. This array form is the
+  preferred form of **CMD**. All additional parameters must be individually expressed
+  as strings in the array:
+
+  ```
+  FROM ubuntu
+  CMD ["/usr/bin/wc","--help"]
+  ```
+
+  -- To make the container run the same executable every time, use **ENTRYPOINT** in
+  combination with **CMD**.
+  If the user specifies arguments to `podman run` or `docker run`, the specified commands
+  override the default in **CMD**.
+  Do not confuse **RUN** with **CMD**. **RUN** runs a command and commits the result.
+  **CMD** executes nothing at build time, but specifies the intended command for
+  the image.
+
+**LABEL**
+  -- `LABEL <key>=<value> [<key>=<value> ...]`or
+  ```
+  LABEL <key>[ <value>]
+  LABEL <key>[ <value>]
+  ...
+  ```
+  The **LABEL** instruction adds metadata to an image. A **LABEL** is a
+  key-value pair. To specify a **LABEL** without a value, simply use an empty
+  string. To include spaces within a **LABEL** value, use quotes and
+  backslashes as you would in command-line parsing.
+
+  ```
+  LABEL com.example.vendor="ACME Incorporated"
+  LABEL com.example.vendor "ACME Incorporated"
+  LABEL com.example.vendor.is-beta ""
+  LABEL com.example.vendor.is-beta=
+  LABEL com.example.vendor.is-beta=""
+  ```
+
+  An image can have more than one label. To specify multiple labels, separate
+  each key-value pair by a space.
+
+  Labels are additive including `LABEL`s in `FROM` images. As the system
+  encounters and then applies a new label, new `key`s override any previous
+  labels with identical keys.
+
+  To display an image's labels, use the `buildah inspect` command.
+
+**EXPOSE**
+  -- `EXPOSE <port> [<port>...]`
+  The **EXPOSE** instruction informs the container engine that the container listens on the
+  specified network ports at runtime. The container engine uses this information to
+  interconnect containers using links and to set up port redirection on the host
+  system.
+
+**ENV**
+  -- `ENV <key> <value>`
+  The **ENV** instruction sets the environment variable <key> to
+  the value `<value>`. This value is passed to all future
+  **RUN**, **ENTRYPOINT**, and **CMD** instructions. This is
+  functionally equivalent to prefixing the command with `<key>=<value>`.  The
+  environment variables that are set with **ENV** persist when a container is run
+  from the resulting image. Use `podman inspect` to inspect these values, and
+  change them using `podman run --env <key>=<value>`.
+
+  Note that setting "`ENV DEBIAN_FRONTEND=noninteractive`" may cause
+  unintended consequences, because it will persist when the container is run
+  interactively, as with the following command: `podman run -t -i image bash`
+
+**ADD**
+  -- **ADD** has two forms:
+
+  ```
+  ADD <src> <dest>
+
+  # Required for paths with whitespace
+  ADD ["<src>",... "<dest>"]
+  ```
+
+  The **ADD** instruction copies new files, directories
+  or remote file URLs to the filesystem of the container at path `<dest>`.
+  Multiple `<src>` resources may be specified but if they are files or directories
+  then they must be relative to the source directory that is being built
+  (the context of the build). The `<dest>` is the absolute path, or path relative
+  to **WORKDIR**, into which the source is copied inside the target container.
+  If the `<src>` argument is a local file in a recognized compression format
+  (tar, gzip, bzip2, etc) then it is unpacked at the specified `<dest>` in the
+  container's filesystem.  Note that only local compressed files will be unpacked,
+  i.e., the URL download and archive unpacking features cannot be used together.
+  All new directories are created with mode 0755 and with the uid and gid of **0**.
+
+**COPY**
+  -- **COPY** has two forms:
+
+  ```
+  COPY <src> <dest>
+
+  # Required for paths with whitespace
+  COPY ["<src>",... "<dest>"]
+  ```
+
+  The **COPY** instruction copies new files from `<src>` and
+  adds them to the filesystem of the container at path <dest>. The `<src>` must be
+  the path to a file or directory relative to the source directory that is
+  being built (the context of the build) or a remote file URL. The `<dest>` is an
+  absolute path, or a path relative to **WORKDIR**, into which the source will
+  be copied inside the target container. If you **COPY** an archive file it will
+  land in the container exactly as it appears in the build context without any
+  attempt to unpack it.  All new files and directories are created with mode **0755**
+  and with the uid and gid of **0**.
+
+**ENTRYPOINT**
+  -- **ENTRYPOINT** has two forms:
+
+  ```
+  # executable form
+  ENTRYPOINT ["executable", "param1", "param2"]`
+
+  # run command in a shell - /bin/sh -c
+  ENTRYPOINT command param1 param2
+  ```
+
+  -- An **ENTRYPOINT** helps you configure a
+  container that can be run as an executable. When you specify an **ENTRYPOINT**,
+  the whole container runs as if it was only that executable.  The **ENTRYPOINT**
+  instruction adds an entry command that is not overwritten when arguments are
+  passed to `podman run`. This is different from the behavior of **CMD**. This allows
+  arguments to be passed to the entrypoint, for instance `podman run <image> -d`
+  passes the -d argument to the **ENTRYPOINT**.  Specify parameters either in the
+  **ENTRYPOINT** JSON array (as in the preferred exec form above), or by using a **CMD**
+  statement.  Parameters in the **ENTRYPOINT** are not overwritten by the `podman run` arguments.  Parameters specified via **CMD** are overwritten by `podman run` arguments.  Specify a plain string for the **ENTRYPOINT**, and it will execute in
+  `/bin/sh -c`, like a **CMD** instruction:
+
+  ```
+  FROM ubuntu
+  ENTRYPOINT wc -l -
+  ```
+
+  This means that the Containerfile's image always takes stdin as input (that's
+  what "-" means), and prints the number of lines (that's what "-l" means). To
+  make this optional but default, use a **CMD**:
+
+  ```
+  FROM ubuntu
+  CMD ["-l", "-"]
+  ENTRYPOINT ["/usr/bin/wc"]
+  ```
+
+**VOLUME**
+  -- `VOLUME ["/data"]`
+  The **VOLUME** instruction creates a mount point with the specified name and marks
+  it as holding externally-mounted volumes from the native host or from other
+  containers.
+
+**USER**
+  -- `USER daemon`
+  Sets the username or UID used for running subsequent commands.
+
+  The **USER** instruction can optionally be used to set the group or GID. The
+  following examples are all valid:
+  USER [user | user:group | uid | uid:gid | user:gid | uid:group ]
+
+  Until the **USER** instruction is set, instructions will be run as root. The USER
+  instruction can be used any number of times in a Containerfile, and will only affect
+  subsequent commands.
+
+**WORKDIR**
+  -- `WORKDIR /path/to/workdir`
+  The **WORKDIR** instruction sets the working directory for the **RUN**, **CMD**,
+  **ENTRYPOINT**, **COPY** and **ADD** Containerfile commands that follow it. It can
+  be used multiple times in a single Containerfile. Relative paths are defined
+  relative to the path of the previous **WORKDIR** instruction. For example:
+
+  ```
+  WORKDIR /a
+  WORKDIR b
+  WORKDIR c
+  RUN pwd
+  ```
+
+  In the above example, the output of the **pwd** command is **a/b/c**.
+
+**ARG**
+   -- ARG <name>[=<default value>]
+
+  The `ARG` instruction defines a variable that users can pass at build-time to
+  the builder with the `podman build` and `buildah build` commands using the
+  `--build-arg <varname>=<value>` flag. If a user specifies a build argument that
+  was not defined in the Containerfile, the build outputs a warning.
+
+  Note that a second FROM in a Containerfile sets the values associated with an
+  Arg variable to nil and they must be reset if they are to be used later in
+  the Containerfile
+
+```
+  [Warning] One or more build-args [foo] were not consumed
+  ```
+
+  The Containerfile author can define a single variable by specifying `ARG` once or many
+  variables by specifying `ARG` more than once. For example, a valid Containerfile:
+
+  ```
+  FROM busybox
+  ARG user1
+  ARG buildno
+  ...
+  ```
+
+  A Containerfile author may optionally specify a default value for an `ARG` instruction:
+
+  ```
+  FROM busybox
+  ARG user1=someuser
+  ARG buildno=1
+  ...
+  ```
+
+  If an `ARG` value has a default and if there is no value passed at build-time, the
+  builder uses the default.
+
+  An `ARG` variable definition comes into effect from the line on which it is
+  defined in the `Containerfile` not from the argument's use on the command-line or
+  elsewhere.  For example, consider this Containerfile:
+
+  ```
+  1 FROM busybox
+  2 USER ${user:-some_user}
+  3 ARG user
+  4 USER $user
+  ...
+  ```
+  A user builds this file by calling:
+
+  ```
+  $ podman build --build-arg user=what_user Containerfile
+  ```
+
+  The `USER` at line 2 evaluates to `some_user` as the `user` variable is defined on the
+  subsequent line 3. The `USER` at line 4 evaluates to `what_user` as `user` is
+  defined and the `what_user` value was passed on the command line. Prior to its definition by an
+  `ARG` instruction, any use of a variable results in an empty string.
+
+  > **Warning:** It is not recommended to use build-time variables for
+  >  passing secrets like github keys, user credentials etc. Build-time variable
+  >  values are visible to any user of the image with the `podman history` command.
+
+  You can use an `ARG` or an `ENV` instruction to specify variables that are
+  available to the `RUN` instruction. Environment variables defined using the
+  `ENV` instruction always override an `ARG` instruction of the same name. Consider
+  this Containerfile with an `ENV` and `ARG` instruction.
+
+  ```
+  1 FROM ubuntu
+  2 ARG CONT_IMG_VER
+  3 ENV CONT_IMG_VER=v1.0.0
+  4 RUN echo $CONT_IMG_VER
+  ```
+  Then, assume this image is built with this command:
+
+  ```
+  $ podman build --build-arg CONT_IMG_VER=v2.0.1 Containerfile
+  ```
+
+  In this case, the `RUN` instruction uses `v1.0.0` instead of the `ARG` setting
+  passed by the user:`v2.0.1` This behavior is similar to a shell
+  script where a locally scoped variable overrides the variables passed as
+  arguments or inherited from environment, from its point of definition.
+
+  Using the example above but a different `ENV` specification you can create more
+  useful interactions between `ARG` and `ENV` instructions:
+
+  ```
+  1 FROM ubuntu
+  2 ARG CONT_IMG_VER
+  3 ENV CONT_IMG_VER=${CONT_IMG_VER:-v1.0.0}
+  4 RUN echo $CONT_IMG_VER
+  ```
+
+  Unlike an `ARG` instruction, `ENV` values are always persisted in the built
+  image. Consider a `podman build` without the --build-arg flag:
+
+  ```
+  $ podman build Containerfile
+  ```
+
+  Using this Containerfile example, `CONT_IMG_VER` is still persisted in the image but
+  its value would be `v1.0.0` as it is the default set in line 3 by the `ENV` instruction.
+
+  The variable expansion technique in this example allows you to pass arguments
+  from the command line and persist them in the final image by leveraging the
+  `ENV` instruction. Variable expansion is only supported for [a limited set of
+  Containerfile instructions.](#environment-replacement)
+
+  Container engines have a set of predefined `ARG` variables that you can use without a
+  corresponding `ARG` instruction in the Containerfile.
+
+  * `HTTP_PROXY`
+  * `http_proxy`
+  * `HTTPS_PROXY`
+  * `https_proxy`
+  * `FTP_PROXY`
+  * `ftp_proxy`
+  * `NO_PROXY`
+  * `no_proxy`
+  * `ALL_PROXY`
+  * `all_proxy`
+
+  To use these, pass them on the command line using `--build-arg` flag, for
+  example:
+
+  ```
+  $ podman build --build-arg HTTPS_PROXY=https://my-proxy.example.com .
+  ```
+
+**ONBUILD**
+  -- `ONBUILD [INSTRUCTION]`
+  The **ONBUILD** instruction adds a trigger instruction to an image. The
+  trigger is executed at a later time, when the image is used as the base for
+  another build. Container engines execute the trigger in the context of the downstream
+  build, as if the trigger existed immediately after the **FROM** instruction in
+  the downstream Containerfile.
+
+  You can register any build instruction as a trigger. A trigger is useful if
+  you are defining an image to use as a base for building other images. For
+  example, if you are defining an application build environment or a daemon that
+  is customized with a user-specific configuration.
+
+  Consider an image intended as a reusable python application builder. It must
+  add application source code to a particular directory, and might need a build
+  script called after that. You can't just call **ADD** and **RUN** now, because
+  you don't yet have access to the application source code, and it is different
+  for each application build.
+
+  -- Providing application developers with a boilerplate Containerfile to copy-paste
+  into their application is inefficient, error-prone, and
+  difficult to update because it mixes with application-specific code.
+  The solution is to use **ONBUILD** to register instructions in advance, to
+  run later, during the next build stage.
+
+## SEE ALSO
+buildah(1), podman(1), docker(1)
+
+# HISTORY
+```
+May 2014, Compiled by Zac Dover (zdover at redhat dot com) based on docker.com Dockerfile documentation.
+Feb 2015, updated by Brian Goff (cpuguy83@gmail.com) for readability
+Sept 2015, updated by Sally O'Malley (somalley@redhat.com)
+Oct 2016, updated by Addam Hardy (addam.hardy@gmail.com)
+Aug 2021, converted Dockerfile man page to Containerfile by Dan Walsh (dwalsh@redhat.com)
+```
diff --git a/SOURCES/containerignore.5.md b/SOURCES/containerignore.5.md
new file mode 100644
index 0000000..b26ef11
--- /dev/null
+++ b/SOURCES/containerignore.5.md
@@ -0,0 +1,87 @@
+% ".containerignore" "28" "Sep 2021" "" "Container User Manuals"
+
+# NAME
+
+.containerignore(.dockerignore) - files to ignore buildah or podman build context directory
+
+# INTRODUCTION
+
+Before container engines build an image, they look for a file named .containerignore or .dockerignore in the root
+context directory. If one of these file exists, the CLI modifies the context to exclude files and
+directories that match patterns specified in the file. This avoids adding them to images using the ADD or COPY
+instruction.
+
+The CLI interprets the .containerignore or .dockerignore file as a newline-separated list of patterns similar to
+the file globs of Unix shells. For the purposes of matching, the root of the context is considered to be both the
+working and the root directory. For example, the patterns /foo/bar and foo/bar both exclude a file or directory
+named bar in the foo subdirectory of PATH or in the root of the git repository located at URL. Neither excludes
+anything else.
+
+If a line in .containerignore or .dockerignore file starts with # in column 1, then this line is considered as a
+comment and is ignored before interpreted by the CLI.
+
+# EXAMPLES
+
+Here is an example .containerignore file:
+
+```
+# comment
+*/temp*
+*/*/temp*
+temp?
+```
+
+This file causes the following build behavior:
+Rule 	Behavior
+```
+# comment 	Ignored.
+*/temp* 	Exclude files and directories whose names start with temp in any immediate subdirectory of the root.
+For example, the plain file /somedir/temporary.txt is excluded, as is the directory /somedir/temp.
+*/*/temp* 	Exclude files and directories starting with temp from any subdirectory that is two levels below the
+root. For example, /somedir/subdir/temporary.txt is excluded.
+temp? 	Exclude files and directories in the root directory whose names are a one-character extension of temp. For example, /tempa and /tempb are excluded.
+```
+Matching is done using Go’s filepath.Match rules. A preprocessing step removes leading and trailing whitespace and
+eliminates . and .. elements using Go’s filepath.Clean. Lines that are blank after preprocessing are ignored.
+
+Beyond Go’s filepath.Match rules, Docker also supports a special wildcard string ** that matches any number of
+directories (including zero). For example, **/*.go will exclude all files that end with .go that are found in all
+directories, including the root of the build context.
+
+Lines starting with ! (exclamation mark) can be used to make exceptions to exclusions. The following is an example .containerignore file that uses this mechanism:
+```
+*.md
+!README.md
+```
+All markdown files except README.md are excluded from the context.
+
+The placement of ! exception rules influences the behavior: the last line of the .containerignore that matches a
+particular file determines whether it is included or excluded. Consider the following example:
+```
+*.md
+!README*.md
+README-secret.md
+```
+No markdown files are included in the context except README files other than README-secret.md.
+
+Now consider this example:
+```
+*.md
+README-secret.md
+!README*.md
+```
+All of the README files are included. The middle line has no effect because !README*.md matches README-secret.md and
+comes last.
+
+You can even use the .containerignore file to exclude the Containerfile or Dockerfile and .containerignore files.
+These files are still sent to the daemon because it needs them to do its job. But the ADD and COPY instructions do
+not copy them to the image.
+
+Finally, you may want to specify which files to include in the context, rather than which to exclude. To achieve
+this, specify * as the first pattern, followed by one or more ! exception patterns.
+
+## SEE ALSO
+buildah-build(1), podman-build(1), docker-build(1)
+
+# HISTORY
+*Sep 2021, Compiled by Dan Walsh (dwalsh at redhat dot com) based on docker.com .dockerignore documentation.
diff --git a/SOURCES/default.yaml b/SOURCES/default.yaml
index 943ea17..fa2ea36 100644
--- a/SOURCES/default.yaml
+++ b/SOURCES/default.yaml
@@ -1,19 +1,19 @@
 # This is a default registries.d configuration file.  You may
 # add to this file or create additional files in registries.d/.
 #
-# sigstore: indicates a location that is read and write
-# sigstore-staging: indicates a location that is only for write
+# lookaside: indicates a location that is read and write
+# lookaside-staging: indicates a location that is only for write
 #
-# sigstore and sigstore-staging take a value of the following:
-#   sigstore:  {schema}://location
+# lookaside and lookaside-staging take a value of the following:
+#   lookaside:  {schema}://location
 #
 # For reading signatures, schema may be http, https, or file.
 # For writing signatures, schema may only be file.
 
 # This is the default signature write location for docker registries.
 default-docker:
-#  sigstore: file:///var/lib/containers/sigstore
-  sigstore-staging: file:///var/lib/containers/sigstore
+#  lookaside: file:///var/lib/containers/sigstore
+  lookaside-staging: file:///var/lib/containers/sigstore
 
 # The 'docker' indicator here is the start of the configuration
 # for docker registries.
@@ -21,6 +21,6 @@ default-docker:
 # docker:
 #
 #   privateregistry.com:
-#    sigstore: http://privateregistry.com/sigstore/
-#    sigstore-staging: /mnt/nfs/privateregistry/sigstore
+#    lookaside: http://privateregistry.com/sigstore/
+#    lookaside-staging: /mnt/nfs/privateregistry/sigstore
 
diff --git a/SOURCES/pyxis.sh b/SOURCES/pyxis.sh
index ad8423f..112a560 100755
--- a/SOURCES/pyxis.sh
+++ b/SOURCES/pyxis.sh
@@ -73,5 +73,6 @@ for D in `cut -d\  -f1 /tmp/r.conf | sort | uniq -d`; do
   fi
 done
 
+sed -i '/.*rhel.*-els\/.*$/d' /tmp/r.conf
 echo "[aliases]" > 001-rhel-shortnames-pyxis.conf
 sort /tmp/r.conf >> 001-rhel-shortnames-pyxis.conf
diff --git a/SOURCES/registries.conf b/SOURCES/registries.conf
index 1d3da14..88f7edc 100644
--- a/SOURCES/registries.conf
+++ b/SOURCES/registries.conf
@@ -19,7 +19,7 @@
 #
 # # An array of host[:port] registries to try when pulling an unqualified image, in order.
 
-unqualified-search-registries = ["registry.fedoraproject.org", "registry.access.redhat.com", "registry.centos.org", "docker.io"]
+unqualified-search-registries = ["registry.access.redhat.com", "registry.redhat.io", "docker.io"]
 
 # [[registry]]
 # # The "prefix" field is used to choose the relevant [[registry]] TOML table;
diff --git a/SOURCES/shortnames.conf b/SOURCES/shortnames.conf
index 51b0e50..4dfba37 100644
--- a/SOURCES/shortnames.conf
+++ b/SOURCES/shortnames.conf
@@ -10,11 +10,12 @@
   "skopeo" = "quay.io/skopeo/stable"
   "buildah" = "quay.io/buildah/stable"
   "podman" = "quay.io/podman/stable"
+  "hello" = "quay.io/podman/hello"
+  "hello-world" = "quay.io/podman/hello"
   # docker
   "alpine" = "docker.io/library/alpine"
   "docker" = "docker.io/library/docker"
   "registry" = "docker.io/library/registry"
-  "hello-world" = "docker.io/library/hello-world"
   "swarm" = "docker.io/library/swarm"
   # Fedora
   "fedora-minimal" = "registry.fedoraproject.org/fedora-minimal"
@@ -72,6 +73,9 @@
   "ubi8/ubi-minimal" = "registry.access.redhat.com/ubi8-minimal"
   "ubi8/ubi-init" = "registry.access.redhat.com/ubi8-init"
   "ubi8/ubi-micro" = "registry.access.redhat.com/ubi8-micro"
+  "ubi8/podman" = "registry.access.redhat.com/ubi8/podman"
+  "ubi8/buildah" = "registry.access.redhat.com/ubi8/buildah"
+  "ubi8/skopeo" = "registry.access.redhat.com/ubi8/skopeo"
   "rhel9" = "registry.access.redhat.com/ubi9"
   "rhel9-init" = "registry.access.redhat.com/ubi9-init"
   "rhel9-minimal" = "registry.access.redhat.com/ubi9-minimal"
@@ -84,6 +88,9 @@
   "ubi9/ubi-minimal" = "registry.access.redhat.com/ubi9-minimal"
   "ubi9/ubi-init" = "registry.access.redhat.com/ubi9-init"
   "ubi9/ubi-micro" = "registry.access.redhat.com/ubi9-micro"
+  "ubi9/podman" = "registry.access.redhat.com/ubi9/podman"
+  "ubi9/buildah" = "registry.access.redhat.com/ubi9/buildah"
+  "ubi9/skopeo" = "registry.access.redhat.com/ubi9/skopeo"
   # Rocky Linux
   "rockylinux" = "docker.io/library/rockylinux"
   # Debian
diff --git a/SOURCES/update.sh b/SOURCES/update.sh
index 6a57556..2e83bac 100755
--- a/SOURCES/update.sh
+++ b/SOURCES/update.sh
@@ -25,14 +25,14 @@ ensure storage.conf    driver                        \"overlay\"
 ensure storage.conf    mountopt                      \"nodev,metacopy=on\"
 if pwd | grep rhel-8 > /dev/null
 then
-ensure registries.conf unqualified-search-registries [\"registry.fedoraproject.org\",\ \"registry.access.redhat.com\",\ \"registry.centos.org\",\ \"docker.io\"]
+ensure registries.conf unqualified-search-registries [\"registry.access.redhat.com\",\ \"registry.redhat.io\",\ \"docker.io\"]
 ensure registries.conf short-name-mode               \"permissive\"
 ensure containers.conf runtime                       \"runc\"
 ensure containers.conf events_logger                 \"file\"
 ensure containers.conf log_driver                    \"k8s-file\"
 ensure containers.conf network_backend               \"cni\"
 else
-ensure registries.conf unqualified-search-registries [\"registry.fedoraproject.org\",\ \"registry.access.redhat.com\",\ \"registry.centos.org\",\ \"quay.io\",\ \"docker.io\"]
+ensure registries.conf unqualified-search-registries [\"registry.access.redhat.com\",\ \"registry.redhat.io\",\ \"docker.io\"]
 ensure registries.conf short-name-mode               \"enforcing\"
 ensure containers.conf runtime                       \"crun\"
 fi
diff --git a/SPECS/containers-common.spec b/SPECS/containers-common.spec
index 6bc6d45..34381b2 100644
--- a/SPECS/containers-common.spec
+++ b/SPECS/containers-common.spec
@@ -12,7 +12,7 @@
 Epoch: 2
 Name: containers-common
 Version: 1
-Release: 28%{?dist}
+Release: 35%{?dist}
 Summary: Common configuration and documentation for containers
 License: ASL 2.0
 BuildRequires: /usr/bin/go-md2man
@@ -56,32 +56,36 @@ Source23: registry.redhat.io.yaml
 #Source24: https://raw.githubusercontent.com/containers/skopeo/%%{skopeo_branch}/default-policy.json
 Source24: default-policy.json
 Source25: https://raw.githubusercontent.com/containers/skopeo/%{skopeo_branch}/default.yaml
+# FIXME: fix the branch once these are available via regular c/common branch
+Source26: https://raw.githubusercontent.com/containers/common/main/docs/Containerfile.5.md
+Source27: https://raw.githubusercontent.com/containers/common/main/docs/containerignore.5.md
+
 # scripts used for synchronization with upstream and shortname generation
 Source100: update.sh
 Source101: update-vendored.sh
 Source102: pyxis.sh
 
-%global aardvark_dns_version v1.0.1
-%global aardvark_dns_branch v1.0.1-rhel
-%global aardvark_dns_commit0 0a8eabf6f696f4f1ab14e5722578829362304e0b
+%global aardvark_dns_version v1.0.3
+#%%global aardvark_dns_branch v1.0.1-rhel
+%global aardvark_dns_commit0 a92337b08fbd88c9eb10c1a5ebce2bf61aa59a7b
 %global aardvark_dns_shortcommit0 %(c=%{aardvark_dns_commit0}; echo ${c:0:7})
 %if 0%{?aardvark_dns_branch:1}
 Source200: https://github.com/containers/aardvark-dns/tarball/%{aardvark_dns_commit0}/%{aardvark_dns_branch}-%{aardvark_dns_shortcommit0}.tar.gz
 %else
 Source200: https://github.com/containers/aardvark-dns/archive/%{aardvark_dns_commit0}/aardvark-dns-%{aardvark_dns_version}-%{aardvark_dns_shortcommit0}.tar.gz
 %endif
-Source201: https://github.com/containers/aardvark-dns/releases/download/%{aardvark_dns_version}/aardvark-dns-%{aardvark_dns_version}-rhel-vendor.tar.gz
+Source201: https://github.com/containers/aardvark-dns/releases/download/%{aardvark_dns_version}/aardvark-dns-%{aardvark_dns_version}-vendor.tar.gz
 
-%global netavark_version v1.0.1
-%global netavark_branch v1.0.1-rhel
-%global netavark_commit0 93af39418a38c9cc901816240c3e7ccb715108c0
+%global netavark_version v1.0.3
+#%%global netavark_branch v1.0.1-rhel
+%global netavark_commit0 ec7efb85ef90db4a14c07cb003b65491f7eb4edf
 %global netavark_shortcommit0 %(c=%{netavark_commit0}; echo ${c:0:7})
 %if 0%{?netavark_branch:1}
 Source300: https://github.com/containers/netavark/tarball/%{netavark_commit0}/%{netavark_branch}-%{netavark_shortcommit0}.tar.gz
 %else
 Source300: https://github.com/containers/netavark/archive/%{netavark_commit0}/netavark-%{netavark_version}-%{netavark_shortcommit0}.tar.gz
 %endif
-Source301: https://github.com/containers/netavark/releases/download/%{netavark_version}/netavark-%{netavark_version}-rhel-vendor.tar.gz
+Source301: https://github.com/containers/netavark/releases/download/%{netavark_version}/netavark-%{netavark_version}-vendor.tar.gz
 
 %description
 This package contains common configuration files and documentation for container
@@ -93,7 +97,7 @@ separately.
 
 %package -n aardvark-dns
 Version: 1.0.1
-Release: 28%{?dist}
+Release: 35%{?dist}
 URL: https://github.com/containers/aardvark-dns
 Summary: Authoritative DNS server for A/AAAA container records
 License: ASL 2.0 and BSD and MIT
@@ -113,7 +117,7 @@ Read more about configuration in `src/backend/mod.rs`.
 
 %package -n netavark
 Version: 1.0.1
-Release: 28%{?dist}
+Release: 35%{?dist}
 URL: https://github.com/containers/netavark
 Summary: OCI network stack
 License: ASL 2.0 and BSD and MIT
@@ -150,11 +154,7 @@ Its features include:
 
 %prep
 tar fx %{SOURCE200}
-%if 0%{?aardvark_dns_branch:1}
-pushd containers-aardvark-dns-%{aardvark_dns_shortcommit0}
-%else
 pushd aardvark-dns-%{aardvark_dns_commit0}
-%endif
 tar fx %{SOURCE201}
 mkdir -p .cargo
 cat >.cargo/config << EOF
@@ -166,11 +166,7 @@ directory = "vendor"
 EOF
 popd
 tar fx %{SOURCE300}
-%if 0%{?netavark_branch:1}
-pushd containers-netavark-%{netavark_shortcommit0}
-%else
 pushd netavark-%{netavark_commit0}
-%endif
 tar fx %{SOURCE301}
 mkdir -p .cargo
 cat >.cargo/config << EOF
@@ -187,20 +183,12 @@ popd
 export RUSTFLAGS="%{build_rustflags}"
 %endif
 
-%if 0%{?aardvark_dns_branch:1}
-pushd containers-aardvark-dns-%{aardvark_dns_shortcommit0}
-%else
 pushd aardvark-dns-%{aardvark_dns_commit0}
-%endif
 %__scm_setup_git -q
 %make_build build
 popd
 
-%if 0%{?netavark_branch:1}
-pushd containers-netavark-%{netavark_shortcommit0}
-%else
 pushd netavark-%{netavark_commit0}
-%endif
 %__scm_setup_git -q
 %make_build build
 pushd docs
@@ -210,19 +198,11 @@ popd
 popd
 
 %install
-%if 0%{?aardvark_dns_branch:1}
-pushd containers-aardvark-dns-%{aardvark_dns_shortcommit0}
-%else
 pushd aardvark-dns-%{aardvark_dns_commit0}
-%endif
 %{__make} DESTDIR=%{buildroot} PREFIX=%{_prefix} install
 popd
 
-%if 0%{?netavark_branch:1}
-pushd containers-netavark-%{netavark_shortcommit0}
-%else
 pushd netavark-%{netavark_commit0}
-%endif
 %{__make} DESTDIR=%{buildroot} PREFIX=%{_prefix} install
 popd
 
@@ -258,6 +238,8 @@ go-md2man -in %{SOURCE12} -out %{buildroot}%{_mandir}/man5/containers-registries
 go-md2man -in %{SOURCE14} -out %{buildroot}%{_mandir}/man5/containers.conf.5
 go-md2man -in %{SOURCE15} -out %{buildroot}%{_mandir}/man5/containers-auth.json.5
 go-md2man -in %{SOURCE16} -out %{buildroot}%{_mandir}/man5/containers-registries.conf.d.5
+go-md2man -in %{SOURCE26} -out %{buildroot}%{_mandir}/man5/Containerfile.5
+go-md2man -in %{SOURCE27} -out %{buildroot}%{_mandir}/man5/containerignore.5
 
 install -dp %{buildroot}%{_datadir}/containers
 install -m0644 %{SOURCE3} %{buildroot}%{_datadir}/containers/mounts.conf
@@ -313,32 +295,36 @@ EOF
 %{_datadir}/rhel/secrets/*
 
 %files -n aardvark-dns
+%license aardvark-dns-%{aardvark_dns_commit0}/LICENSE
 %dir %{_libexecdir}/podman
 %{_libexecdir}/podman/aardvark-dns
 
 %files -n netavark
+%license netavark-%{netavark_commit0}/LICENSE
 %dir %{_libexecdir}/podman
 %{_libexecdir}/podman/netavark
 %{_mandir}/man1/netavark.1*
 
 %changelog
-* Fri Apr 01 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-28
-- update vendored tarballs to avoid unwanted licenses
-  (thanks to Brent Baude)
-- Related: #2065707
-
-* Thu Mar 31 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-28
-- update vendored tarballs to avoid unwanted licenses
-  (thanks to Brent Baude)
-- Related: #2065707
-
-* Fri Mar 25 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-27
-- remove broken license links from spec file
-- Related: #2065707
-
-* Thu Mar 24 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-26
-- consume aardvark-dns and netavark off the v1.0.1-rhel branch
-- Resolves: #2065707
+* Wed Jul 13 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-35
+- update vendored components and configuration files
+- Related: #2061390
+
+* Mon Jun 27 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-34
+- update shortnames and be sure to remove rhel-els
+- Related: #2061390
+
+* Thu Jun 09 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-33
+- additional fix for unqualified registries
+- Related: #2061390
+
+* Wed May 11 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-26
+- update vendored components and configuration files
+- Related: #2061390
+
+* Fri Apr 01 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-25
+- update vendored components and configuration files
+- Related: #2061390
 
 * Mon Feb 28 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-23
 - update to netavark and aardvark-dns 1.0.1