From 169ddb8db1b2b1f7117657af86f3724d6baaf1ed Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Nov 08 2022 06:35:18 +0000
Subject: import containers-common-1-40.module+el8.7.0+16772+33343656


---

diff --git a/.containers-common.metadata b/.containers-common.metadata
index b640513..e69de29 100644
--- a/.containers-common.metadata
+++ b/.containers-common.metadata
@@ -1,4 +0,0 @@
-5a594964d481c7bbcf748a43599391619866eebb SOURCES/aardvark-dns-v1.0.1-rhel-vendor.tar.gz
-55243a6cb078d864c2de629f69005174770f9588 SOURCES/netavark-1.0.1-rhel-vendor.tar.gz
-a204a6b69eeb26a1ff1e934eed8c928a8e549f53 SOURCES/v1.0.1-rhel-03e1d60.tar.gz
-32687f7102fea472e000ffad5e605f753c8f461e SOURCES/v1.0.1-rhel-95a32bf.tar.gz
diff --git a/.gitignore b/.gitignore
index 9cb2a73..e69de29 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +0,0 @@
-SOURCES/aardvark-dns-v1.0.1-rhel-vendor.tar.gz
-SOURCES/netavark-1.0.1-rhel-vendor.tar.gz
-SOURCES/v1.0.1-rhel-03e1d60.tar.gz
-SOURCES/v1.0.1-rhel-95a32bf.tar.gz
diff --git a/SOURCES/001-rhel-shortnames-pyxis.conf b/SOURCES/001-rhel-shortnames-pyxis.conf
index 77669a4..74c2a23 100644
--- a/SOURCES/001-rhel-shortnames-pyxis.conf
+++ b/SOURCES/001-rhel-shortnames-pyxis.conf
@@ -11,9 +11,20 @@
 "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"
+"3scale-mas/3scale-operator-bundle" = "registry.redhat.io/3scale-mas/3scale-operator-bundle"
+"3scale-mas/3scale-rhel7-operator" = "registry.redhat.io/3scale-mas/3scale-rhel7-operator"
 "3scale-mas/3scale-rhel7" = "registry.redhat.io/3scale-mas/3scale-rhel7"
+"3scale-mas/apicast-gateway-rhel8" = "registry.redhat.io/3scale-mas/apicast-gateway-rhel8"
+"3scale-mas/apicast-operator-bundle" = "registry.redhat.io/3scale-mas/apicast-operator-bundle"
+"3scale-mas/apicast-rhel7-operator" = "registry.redhat.io/3scale-mas/apicast-rhel7-operator"
+"3scale-mas/backend-rhel8" = "registry.redhat.io/3scale-mas/backend-rhel8"
+"3scale-mas/memcached-rhel7" = "registry.redhat.io/3scale-mas/memcached-rhel7"
+"3scale-mas/system-rhel7" = "registry.redhat.io/3scale-mas/system-rhel7"
+"3scale-mas/toolbox-rhel8" = "registry.redhat.io/3scale-mas/toolbox-rhel8"
+"3scale-mas/zync-rhel8" = "registry.redhat.io/3scale-mas/zync-rhel8"
 "5f7d444f29373868204229e0/corent-jtrac-application" = "registry.connect.redhat.com/5f7d444f29373868204229e0/corent-jtrac-application"
 "5f7d444f29373868204229e0/corent-jtrac-operator" = "registry.connect.redhat.com/5f7d444f29373868204229e0/corent-jtrac-operator"
+"5f7d444f29373868204229e0/corent-operator-bundle" = "registry.connect.redhat.com/5f7d444f29373868204229e0/corent-operator-bundle"
 "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"
@@ -30,6 +41,7 @@
 "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-init" = "registry.connect.redhat.com/aerospike/aerospike-kubernetes-init"
 "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"
@@ -68,15 +80,11 @@
 "amq7/amq-online-1-service-broker" = "registry.access.redhat.com/amq7/amq-online-1-service-broker"
 "amq7/amq-online-1-standard-controller" = "registry.access.redhat.com/amq7/amq-online-1-standard-controller"
 "amq7/amq-online-1-topic-forwarder" = "registry.access.redhat.com/amq7/amq-online-1-topic-forwarder"
-"amq7/amq-streams-bridge-rhel7" = "registry.redhat.io/amq7/amq-streams-bridge-rhel7"
 "amq7/amq-streams-bridge-rhel8" = "registry.redhat.io/amq7/amq-streams-bridge-rhel8"
 "amq7/amq-streams-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-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"
 "amq7/amq-streams-rhel8-operator" = "registry.redhat.io/amq7/amq-streams-rhel8-operator"
@@ -130,6 +138,7 @@
 "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/ee-minimal-rhel8" = "registry.redhat.io/ansible-automation-platform/ee-minimal-rhel8"
 "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"
@@ -193,6 +202,7 @@
 "azul/zulu-jdk-7u191" = "registry.connect.redhat.com/azul/zulu-jdk-7u191"
 "azul/zulu-jdk-8u181" = "registry.connect.redhat.com/azul/zulu-jdk-8u181"
 "balabit/syslog-ng-ose" = "registry.connect.redhat.com/balabit/syslog-ng-ose"
+"bcook/simple-demo-operator" = "registry.redhat.io/bcook/simple-demo-operator"
 "bigid/bigid-config-service" = "registry.connect.redhat.com/bigid/bigid-config-service"
 "bigid/bigid-corr-new" = "registry.connect.redhat.com/bigid/bigid-corr-new"
 "bigid/bigid-data-catalog" = "registry.connect.redhat.com/bigid/bigid-data-catalog"
@@ -366,14 +376,8 @@
 "cloudhedge/transform-service-windows" = "registry.connect.redhat.com/cloudhedge/transform-service-windows"
 "cloudhedge/vault-service" = "registry.connect.redhat.com/cloudhedge/vault-service"
 "cloudhedge/webapp" = "registry.connect.redhat.com/cloudhedge/webapp"
-"cnvrg-core/cnvrg-app" = "registry.connect.redhat.com/cnvrg-core/cnvrg-app"
 "cnvrg-core/cnvrg-core" = "registry.connect.redhat.com/cnvrg-core/cnvrg-core"
-"cnvrg-core/cnvrg-es" = "registry.connect.redhat.com/cnvrg-core/cnvrg-es"
-"cnvrg-core/cnvrgio-operator-bundle" = "registry.connect.redhat.com/cnvrg-core/cnvrgio-operator-bundle"
-"cnvrg-core/cnvrgio-operator" = "registry.connect.redhat.com/cnvrg-core/cnvrgio-operator"
-"cnvrg-core/cnvrgio-seeder" = "registry.connect.redhat.com/cnvrg-core/cnvrgio-seeder"
-"cnvrg-core/cnvrg-minios" = "registry.connect.redhat.com/cnvrg-core/cnvrg-minios"
-"cnvrg-core/cnvrg" = "registry.connect.redhat.com/cnvrg-core/cnvrg"
+"cnvrg-core/cnvrg" = "registry.redhat.io/cnvrg-core/cnvrg"
 "cnv-tech-preview/virt-launcher-cpaas-mvp" = "registry.redhat.io/cnv-tech-preview/virt-launcher-cpaas-mvp"
 "cockroachdb/cockroachdb-operator-bundle-marketplace" = "registry.connect.redhat.com/cockroachdb/cockroachdb-operator-bundle-marketplace"
 "cockroachdb/cockroachdb-operator-bundle" = "registry.connect.redhat.com/cockroachdb/cockroachdb-operator-bundle"
@@ -459,9 +463,8 @@
 "containous/traefikee" = "registry.connect.redhat.com/containous/traefikee"
 "contrastsecurity/java-agent" = "registry.redhat.io/contrastsecurity/java-agent"
 "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-manifests-bundle" = "registry.redhat.io/coralogix/coralogix-operator-manifests-bundle"
 "coralogix/coralogix-operator" = "registry.connect.redhat.com/coralogix/coralogix-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"
 "costmanagement/costmanagement-metrics-rhel8-operator" = "registry.redhat.io/costmanagement/costmanagement-metrics-rhel8-operator"
@@ -471,6 +474,7 @@
 "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/operator-rhmp" = "registry.connect.redhat.com/couchbase/operator-rhmp"
 "couchbase/server" = "registry.connect.redhat.com/couchbase/server"
 "couchbase/sync-gateway" = "registry.connect.redhat.com/couchbase/sync-gateway"
 "crunchydata/crunchy-admin" = "registry.connect.redhat.com/crunchydata/crunchy-admin"
@@ -567,7 +571,6 @@
 "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"
@@ -624,6 +627,7 @@
 "enterprisedb/edb-epas-lite11" = "registry.connect.redhat.com/enterprisedb/edb-epas-lite11"
 "epsagon/epsagon-operator" = "registry.connect.redhat.com/epsagon/epsagon-operator"
 "eres/v70" = "registry.connect.redhat.com/eres/v70"
+"eweb/cloudnfv" = "registry.connect.redhat.com/eweb/cloudnfv"
 "exfo/uverifier" = "registry.connect.redhat.com/exfo/uverifier"
 "f5networks/cntr-ingress-svcs" = "registry.redhat.io/f5networks/cntr-ingress-svcs"
 "f5networks/f5-ipam-controller-operator-bundle" = "registry.redhat.io/f5networks/f5-ipam-controller-operator-bundle"
@@ -637,9 +641,19 @@
 "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"
+"flux/flux-operator" = "registry.connect.redhat.com/flux/flux-operator"
 "flux/helm-controller-old" = "registry.connect.redhat.com/flux/helm-controller-old"
+"flux/helm-controller" = "registry.connect.redhat.com/flux/helm-controller"
+"flux/image-automation-controller-old" = "registry.connect.redhat.com/flux/image-automation-controller-old"
+"flux/image-automation-controller" = "registry.connect.redhat.com/flux/image-automation-controller"
+"flux/image-reflector-controller-old" = "registry.connect.redhat.com/flux/image-reflector-controller-old"
+"flux/image-reflector-controller" = "registry.connect.redhat.com/flux/image-reflector-controller"
 "flux/kustomize-controller-old" = "registry.connect.redhat.com/flux/kustomize-controller-old"
+"flux/kustomize-controller" = "registry.connect.redhat.com/flux/kustomize-controller"
+"flux/notification-controller-old" = "registry.connect.redhat.com/flux/notification-controller-old"
+"flux/notification-controller" = "registry.connect.redhat.com/flux/notification-controller"
 "flux/source-controller-old" = "registry.connect.redhat.com/flux/source-controller-old"
+"flux/source-controller" = "registry.redhat.io/flux/source-controller"
 "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"
@@ -719,7 +733,6 @@
 "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"
-"h2oai/driverless-ai-operator" = "registry.redhat.io/h2oai/driverless-ai-operator"
 "h2oai/driverlessai-rhelubi7" = "registry.redhat.io/h2oai/driverlessai-rhelubi7"
 "h2oai/h2o-operator-bundle" = "registry.connect.redhat.com/h2oai/h2o-operator-bundle"
 "h2oai/h2o-operator" = "registry.connect.redhat.com/h2oai/h2o-operator"
@@ -792,6 +805,19 @@
 "ibm/aspera-hsts-scheduler" = "registry.connect.redhat.com/ibm/aspera-hsts-scheduler"
 "ibm/aspera-hsts-tcp-proxy" = "registry.connect.redhat.com/ibm/aspera-hsts-tcp-proxy"
 "ibm/aspera-hsts-utils" = "registry.connect.redhat.com/ibm/aspera-hsts-utils"
+"ibm-bamoe/bamoe-businesscentral-monitoring-rhel8" = "registry.redhat.io/ibm-bamoe/bamoe-businesscentral-monitoring-rhel8"
+"ibm-bamoe/bamoe-businesscentral-rhel8" = "registry.redhat.io/ibm-bamoe/bamoe-businesscentral-rhel8"
+"ibm-bamoe/bamoe-controller-rhel8" = "registry.redhat.io/ibm-bamoe/bamoe-controller-rhel8"
+"ibm-bamoe/bamoe-dashbuilder-rhel8" = "registry.redhat.io/ibm-bamoe/bamoe-dashbuilder-rhel8"
+"ibm-bamoe/bamoe-kieserver-rhel8" = "registry.redhat.io/ibm-bamoe/bamoe-kieserver-rhel8"
+"ibm-bamoe/bamoe-kogito-builder-rhel8" = "registry.redhat.io/ibm-bamoe/bamoe-kogito-builder-rhel8"
+"ibm-bamoe/bamoe-kogito-rhel8-operator-bundle" = "registry.redhat.io/ibm-bamoe/bamoe-kogito-rhel8-operator-bundle"
+"ibm-bamoe/bamoe-kogito-rhel8-operator" = "registry.redhat.io/ibm-bamoe/bamoe-kogito-rhel8-operator"
+"ibm-bamoe/bamoe-kogito-runtime-jvm-rhel8" = "registry.redhat.io/ibm-bamoe/bamoe-kogito-runtime-jvm-rhel8"
+"ibm-bamoe/bamoe-operator-bundle" = "registry.redhat.io/ibm-bamoe/bamoe-operator-bundle"
+"ibm-bamoe/bamoe-process-migration-rhel8" = "registry.redhat.io/ibm-bamoe/bamoe-process-migration-rhel8"
+"ibm-bamoe/bamoe-rhel8-operator" = "registry.redhat.io/ibm-bamoe/bamoe-rhel8-operator"
+"ibm-bamoe/bamoe-smartrouter-rhel8" = "registry.redhat.io/ibm-bamoe/bamoe-smartrouter-rhel8"
 "ibm/cadvisor-ppc64le" = "registry.connect.redhat.com/ibm/cadvisor-ppc64le"
 "ibm/caffe" = "registry.connect.redhat.com/ibm/caffe"
 "ibm/cassandra-ppc64le" = "registry.connect.redhat.com/ibm/cassandra-ppc64le"
@@ -985,8 +1011,8 @@
 "jboss-webserver-3/webserver31-tomcat8-openshift" = "registry.access.redhat.com/jboss-webserver-3/webserver31-tomcat8-openshift"
 "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"
-"jboss-webserver-5/webserver-openjdk8-rhel8-operator" = "registry.redhat.io/jboss-webserver-5/webserver-openjdk8-rhel8-operator"
+"jboss-webserver-5/jws5-operator-bundle" = "registry.redhat.io/jboss-webserver-5/jws5-operator-bundle"
+"jboss-webserver-5/jws5-rhel8-operator" = "registry.redhat.io/jboss-webserver-5/jws5-rhel8-operator"
 "jennifersoft/java-agent" = "registry.connect.redhat.com/jennifersoft/java-agent"
 "jetstack/cert-manager-operator-bundle" = "registry.connect.redhat.com/jetstack/cert-manager-operator-bundle"
 "jfrog/artifactory-operator-bundle" = "registry.connect.redhat.com/jfrog/artifactory-operator-bundle"
@@ -1008,7 +1034,7 @@
 "jfrog/xray-analysis" = "registry.connect.redhat.com/jfrog/xray-analysis"
 "jfrog/xray-indexer" = "registry.connect.redhat.com/jfrog/xray-indexer"
 "jfrog/xray-operator-bundle" = "registry.connect.redhat.com/jfrog/xray-operator-bundle"
-"jfrog/xray-operator" = "registry.connect.redhat.com/jfrog/xray-operator"
+"jfrog/xray-operator" = "registry.redhat.io/jfrog/xray-operator"
 "jfrog/xray-persist" = "registry.connect.redhat.com/jfrog/xray-persist"
 "jfrog/xray-rabbitmq" = "registry.connect.redhat.com/jfrog/xray-rabbitmq"
 "jfrog/xray-router" = "registry.connect.redhat.com/jfrog/xray-router"
@@ -1056,6 +1082,7 @@
 "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"
+"kong/kong-offline-operator1-bundle-marketplace" = "registry.connect.redhat.com/kong/kong-offline-operator1-bundle-marketplace"
 "kong/kong-offline-operator1-bundle" = "registry.connect.redhat.com/kong/kong-offline-operator1-bundle"
 "kong/kong-offline-operator1" = "registry.connect.redhat.com/kong/kong-offline-operator1"
 "kong/kong-operator1" = "registry.connect.redhat.com/kong/kong-operator1"
@@ -1078,7 +1105,6 @@
 "lightbend/akka-cluster-demo" = "registry.connect.redhat.com/lightbend/akka-cluster-demo"
 "linbit/drbd-9" = "registry.connect.redhat.com/linbit/drbd-9"
 "linbit/linstor-controller" = "registry.redhat.io/linbit/linstor-controller"
-"linbit/linstor-csi" = "registry.connect.redhat.com/linbit/linstor-csi"
 "linbit/linstor-operator-bundle" = "registry.connect.redhat.com/linbit/linstor-operator-bundle"
 "linbit/linstor-operator" = "registry.connect.redhat.com/linbit/linstor-operator"
 "linbit/linstor-satellite" = "registry.redhat.io/linbit/linstor-satellite"
@@ -1123,6 +1149,8 @@
 "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/4g-du-rhubi" = "registry.redhat.io/mrhcert/4g-du-rhubi"
+"mrhcert/du" = "registry.redhat.io/mrhcert/du"
 "mrhcert/nginx-bccsvc" = "quay.io/mrhcert/nginx-bccsvc"
 "mrhcert/nginx-dalsvc" = "quay.io/mrhcert/nginx-dalsvc"
 "mrhcert/nginx-dprmsvc" = "quay.io/mrhcert/nginx-dprmsvc"
@@ -1331,7 +1359,7 @@
 "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-10-9" = "registry.redhat.io/nuagenetworks/rhosp16-openstack-heat-api-20-10-9"
+"nuagenetworks/rhosp16-openstack-heat-api-20-10-9" = "registry.connect.redhat.com/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"
@@ -1443,7 +1471,6 @@
 "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"
 "opencloudio/audit-policy-controller" = "registry.redhat.io/opencloudio/audit-policy-controller"
@@ -1458,7 +1485,7 @@
 "opencloudio/curl" = "quay.io/opencloudio/curl"
 "opencloudio/dashboard-controller" = "quay.io/opencloudio/dashboard-controller"
 "opencloudio/fluentd" = "quay.io/opencloudio/fluentd"
-"opencloudio/grafana-ocpthanos-proxy" = "quay.io/opencloudio/grafana-ocpthanos-proxy"
+"opencloudio/grafana-ocpthanos-proxy" = "registry.redhat.io/opencloudio/grafana-ocpthanos-proxy"
 "opencloudio/grafana" = "quay.io/opencloudio/grafana"
 "opencloudio/iam-policy-administration" = "quay.io/opencloudio/iam-policy-administration"
 "opencloudio/iam-policy-controller" = "quay.io/opencloudio/iam-policy-controller"
@@ -1619,11 +1646,7 @@
 "openshift3/automation-broker-apb" = "registry.access.redhat.com/openshift3/automation-broker-apb"
 "openshift3/grafana" = "registry.access.redhat.com/openshift3/grafana"
 "openshift3/image-inspector" = "registry.access.redhat.com/openshift3/image-inspector"
-"openshift3/jenkins-2-rhel7" = "registry.access.redhat.com/openshift3/jenkins-2-rhel7"
-"openshift3/jenkins-agent-maven-35-rhel7" = "registry.access.redhat.com/openshift3/jenkins-agent-maven-35-rhel7"
 "openshift3/jenkins-agent-maven-36-rhel7" = "registry.redhat.io/openshift3/jenkins-agent-maven-36-rhel7"
-"openshift3/jenkins-agent-nodejs-12-rhel7" = "registry.redhat.io/openshift3/jenkins-agent-nodejs-12-rhel7"
-"openshift3/jenkins-slave-base-rhel7" = "registry.access.redhat.com/openshift3/jenkins-slave-base-rhel7"
 "openshift3/kuryr-cni" = "registry.redhat.io/openshift3/kuryr-cni"
 "openshift3/kuryr-controller" = "registry.access.redhat.com/openshift3/kuryr-controller"
 "openshift3/logging-elasticsearch" = "registry.access.redhat.com/openshift3/logging-elasticsearch"
@@ -1631,8 +1654,6 @@
 "openshift3/mariadb-apb" = "registry.access.redhat.com/openshift3/mariadb-apb"
 "openshift3/mediawiki-apb" = "registry.access.redhat.com/openshift3/mediawiki-apb"
 "openshift3/mediawiki" = "registry.access.redhat.com/openshift3/mediawiki"
-"openshift3/metrics-cassandra" = "registry.access.redhat.com/openshift3/metrics-cassandra"
-"openshift3/metrics-hawkular-metrics" = "registry.access.redhat.com/openshift3/metrics-hawkular-metrics"
 "openshift3/metrics-heapster" = "registry.access.redhat.com/openshift3/metrics-heapster"
 "openshift3/metrics-schema-installer" = "registry.access.redhat.com/openshift3/metrics-schema-installer"
 "openshift3/mysql-apb" = "registry.access.redhat.com/openshift3/mysql-apb"
@@ -1843,7 +1864,6 @@
 "openshift4/ose-metering-ansible-operator" = "registry.redhat.io/openshift4/ose-metering-ansible-operator"
 "openshift4/ose-metering-ansible-rhel7-operator-metadata" = "registry.redhat.io/openshift4/ose-metering-ansible-rhel7-operator-metadata"
 "openshift4/ose-metering-hadoop" = "registry.redhat.io/openshift4/ose-metering-hadoop"
-"openshift4/ose-metering-helm-container-rhel7" = "registry.redhat.io/openshift4/ose-metering-helm-container-rhel7"
 "openshift4/ose-metering-helm-container-rhel8" = "registry.redhat.io/openshift4/ose-metering-helm-container-rhel8"
 "openshift4/ose-metering-hive" = "registry.redhat.io/openshift4/ose-metering-hive"
 "openshift4/ose-metering-presto" = "registry.redhat.io/openshift4/ose-metering-presto"
@@ -1973,12 +1993,6 @@
 "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"
-"openshift-serverless-1/eventing-kafka-source-controller-rhel8" = "registry.redhat.io/openshift-serverless-1/eventing-kafka-source-controller-rhel8"
-"openshift-serverless-1/eventing-kafka-source-receive-adapter-rhel8" = "registry.redhat.io/openshift-serverless-1/eventing-kafka-source-receive-adapter-rhel8"
-"openshift-serverless-1/eventing-kafka-storage-version-migration-rhel8" = "registry.redhat.io/openshift-serverless-1/eventing-kafka-storage-version-migration-rhel8"
 "openshift-serverless-1/eventing-mtbroker-filter-rhel8" = "registry.redhat.io/openshift-serverless-1/eventing-mtbroker-filter-rhel8"
 "openshift-serverless-1/eventing-mtbroker-ingress-rhel8" = "registry.redhat.io/openshift-serverless-1/eventing-mtbroker-ingress-rhel8"
 "openshift-serverless-1/eventing-mtchannel-broker-rhel8" = "registry.redhat.io/openshift-serverless-1/eventing-mtchannel-broker-rhel8"
@@ -2012,7 +2026,6 @@
 "openshift-service-mesh/istio-cni-rhel8" = "registry.redhat.io/openshift-service-mesh/istio-cni-rhel8"
 "openshift-service-mesh/istio-must-gather-rhel8" = "registry.redhat.io/openshift-service-mesh/istio-must-gather-rhel8"
 "openshift-service-mesh/istio-rhel8-operator" = "registry.redhat.io/openshift-service-mesh/istio-rhel8-operator"
-"openshift-service-mesh/kiali-rhel7" = "registry.redhat.io/openshift-service-mesh/kiali-rhel7"
 "openshift-service-mesh/kiali-rhel8-operator" = "registry.redhat.io/openshift-service-mesh/kiali-rhel8-operator"
 "openshift-service-mesh/kiali-rhel8" = "registry.redhat.io/openshift-service-mesh/kiali-rhel8"
 "openshift-service-mesh/mixer-rhel8" = "registry.redhat.io/openshift-service-mesh/mixer-rhel8"
@@ -2053,10 +2066,13 @@
 "organization/edb/postgresql-11" = "quay.io/organization/edb/postgresql-11"
 "organization/edb/stolon" = "quay.io/organization/edb/stolon"
 "orientdb/orientdb-community" = "registry.connect.redhat.com/orientdb/orientdb-community"
+"oscargcervantes/rtf-agent-operator" = "registry.connect.redhat.com/oscargcervantes/rtf-agent-operator"
 "ospid-3d0a4254-c562-4b0b-aca9-d74f4987ad66/operator-image-296577" = "scan.connect.redhat.com/ospid-3d0a4254-c562-4b0b-aca9-d74f4987ad66/operator-image-296577"
 "outcoldsolutions/collectorforopenshift" = "registry.connect.redhat.com/outcoldsolutions/collectorforopenshift"
 "outlyer/agent2" = "registry.connect.redhat.com/outlyer/agent2"
 "owldq/owldq-operator" = "registry.connect.redhat.com/owldq/owldq-operator"
+"pachyderm/backup-handler" = "registry.redhat.io/pachyderm/backup-handler"
+"pachyderm/console" = "registry.connect.redhat.com/pachyderm/console"
 "pachyderm/etcd" = "registry.connect.redhat.com/pachyderm/etcd"
 "pachyderm/init-utils" = "registry.connect.redhat.com/pachyderm/init-utils"
 "pachyderm/pachd" = "registry.connect.redhat.com/pachyderm/pachd"
@@ -2153,11 +2169,15 @@
 "r-61dd6d33377742def7df0cba" = "quay.io/r-61dd6d33377742def7df0cba"
 "r-61deecd49593409b3d9e2f56" = "quay.io/r-61deecd49593409b3d9e2f56"
 "r6security/phoenix-operator" = "registry.connect.redhat.com/r6security/phoenix-operator"
+"r6security/phoenix-operatorv071" = "registry.connect.redhat.com/r6security/phoenix-operatorv071"
 "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-analytics" = "registry.connect.redhat.com/rebaca/abot-analytics"
+"rebaca/abot-bdd" = "registry.connect.redhat.com/rebaca/abot-bdd"
+"rebaca/abot-gui" = "registry.connect.redhat.com/rebaca/abot-gui"
 "rebaca/abot-rabbitmq-ubi8" = "registry.connect.redhat.com/rebaca/abot-rabbitmq-ubi8"
+"rebaca/abot-stacks" = "registry.redhat.io/rebaca/abot-stacks"
 "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"
@@ -2177,7 +2197,6 @@
 "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"
@@ -2190,24 +2209,17 @@
 "rhacm2/assisted-installer-agent-rhel8" = "registry.redhat.io/rhacm2/assisted-installer-agent-rhel8"
 "rhacm2/assisted-installer-reporter-rhel8" = "registry.redhat.io/rhacm2/assisted-installer-reporter-rhel8"
 "rhacm2/assisted-installer-rhel8" = "registry.redhat.io/rhacm2/assisted-installer-rhel8"
-"rhacm2/cainjector-rhel8" = "registry.redhat.io/rhacm2/cainjector-rhel8"
-"rhacm2/cert-manager-controller-rhel8" = "registry.redhat.io/rhacm2/cert-manager-controller-rhel8"
-"rhacm2/cert-manager-webhook-rhel8" = "registry.redhat.io/rhacm2/cert-manager-webhook-rhel8"
 "rhacm2/cert-policy-controller-rhel8" = "registry.redhat.io/rhacm2/cert-policy-controller-rhel8"
 "rhacm2/cluster-backup-rhel8-operator" = "registry.redhat.io/rhacm2/cluster-backup-rhel8-operator"
 "rhacm2/clusterclaims-controller-rhel8" = "registry.redhat.io/rhacm2/clusterclaims-controller-rhel8"
 "rhacm2/cluster-curator-controller-rhel8" = "registry.redhat.io/rhacm2/cluster-curator-controller-rhel8"
 "rhacm2/clusterlifecycle-state-metrics-rhel8" = "registry.redhat.io/rhacm2/clusterlifecycle-state-metrics-rhel8"
 "rhacm2/cluster-proxy-addon-rhel8" = "registry.redhat.io/rhacm2/cluster-proxy-addon-rhel8"
-"rhacm2/configmap-watcher-rhel8" = "registry.redhat.io/rhacm2/configmap-watcher-rhel8"
 "rhacm2/config-policy-controller-rhel8" = "registry.redhat.io/rhacm2/config-policy-controller-rhel8"
 "rhacm2/console-api-rhel8" = "registry.redhat.io/rhacm2/console-api-rhel8"
-"rhacm2/console-header-rhel8" = "registry.redhat.io/rhacm2/console-header-rhel8"
 "rhacm2/console-rhel8" = "registry.redhat.io/rhacm2/console-rhel8"
 "rhacm2/discovery-rhel8-operator" = "registry.redhat.io/rhacm2/discovery-rhel8-operator"
-"rhacm2/endpoint-component-rhel8-operator" = "registry.redhat.io/rhacm2/endpoint-component-rhel8-operator"
 "rhacm2/endpoint-monitoring-rhel8-operator" = "registry.redhat.io/rhacm2/endpoint-monitoring-rhel8-operator"
-"rhacm2/endpoint-rhel8-operator" = "registry.redhat.io/rhacm2/endpoint-rhel8-operator"
 "rhacm2/gatekeeper-operator-bundle" = "registry.redhat.io/rhacm2/gatekeeper-operator-bundle"
 "rhacm2/gatekeeper-rhel8-operator" = "registry.redhat.io/rhacm2/gatekeeper-rhel8-operator"
 "rhacm2/gatekeeper-rhel8" = "registry.redhat.io/rhacm2/gatekeeper-rhel8"
@@ -2233,8 +2245,6 @@
 "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"
-"rhacm2/mcm-topology-api-rhel8" = "registry.redhat.io/rhacm2/mcm-topology-api-rhel8"
-"rhacm2/mcm-topology-rhel8" = "registry.redhat.io/rhacm2/mcm-topology-rhel8"
 "rhacm2/memcached-exporter-rhel7" = "registry.redhat.io/rhacm2/memcached-exporter-rhel7"
 "rhacm2/memcached-exporter-rhel8" = "registry.redhat.io/rhacm2/memcached-exporter-rhel8"
 "rhacm2/memcached-rhel8" = "registry.redhat.io/rhacm2/memcached-rhel8"
@@ -2259,7 +2269,6 @@
 "rhacm2/prometheus-rhel8" = "registry.redhat.io/rhacm2/prometheus-rhel8"
 "rhacm2/provider-credential-controller-rhel8" = "registry.redhat.io/rhacm2/provider-credential-controller-rhel8"
 "rhacm2/rbac-query-proxy-rhel8" = "registry.redhat.io/rhacm2/rbac-query-proxy-rhel8"
-"rhacm2/rcm-controller-rhel8" = "registry.redhat.io/rhacm2/rcm-controller-rhel8"
 "rhacm2/redisgraph-tls-rhel8" = "registry.redhat.io/rhacm2/redisgraph-tls-rhel8"
 "rhacm2/registration-rhel8-operator" = "registry.redhat.io/rhacm2/registration-rhel8-operator"
 "rhacm2/registration-rhel8" = "registry.redhat.io/rhacm2/registration-rhel8"
@@ -2286,6 +2295,10 @@
 "rhacm2/volsync-rhel8" = "registry.redhat.io/rhacm2/volsync-rhel8"
 "rhacm2/work-rhel8" = "registry.redhat.io/rhacm2/work-rhel8"
 "rh-acs/collector" = "registry.redhat.io/rh-acs/collector"
+"rhai-tech-preview/assisted-installer-agent-rhel8" = "registry.access.redhat.com/rhai-tech-preview/assisted-installer-agent-rhel8"
+"rhai-tech-preview/assisted-installer-reporter-rhel8" = "registry.access.redhat.com/rhai-tech-preview/assisted-installer-reporter-rhel8"
+"rhai-tech-preview/assisted-installer-rhel8" = "registry.access.redhat.com/rhai-tech-preview/assisted-installer-rhel8"
+"rhai-tech-preview/assisted-service-rhel8" = "registry.access.redhat.com/rhai-tech-preview/assisted-service-rhel8"
 "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"
@@ -2298,6 +2311,7 @@
 "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"
+"rhceph/snmp-notifier-rhel9" = "registry.redhat.io/rhceph/snmp-notifier-rhel9"
 "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"
@@ -2342,7 +2356,6 @@
 "rhel8/net-snmp" = "registry.redhat.io/rhel8/net-snmp"
 "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"
 "rhel8/nodejs-14-minimal" = "registry.redhat.io/rhel8/nodejs-14-minimal"
 "rhel8/nodejs-14" = "registry.redhat.io/rhel8/nodejs-14"
 "rhel8/nodejs-16-minimal" = "registry.redhat.io/rhel8/nodejs-16-minimal"
@@ -2367,10 +2380,8 @@
 "rhel8/rhel-guest-image" = "registry.redhat.io/rhel8/rhel-guest-image"
 "rhel8/rsyslog" = "registry.redhat.io/rhel8/rsyslog"
 "rhel8/ruby-25" = "registry.redhat.io/rhel8/ruby-25"
-"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"
@@ -2391,7 +2402,6 @@
 "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"
@@ -2449,9 +2459,6 @@
 "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"
@@ -2469,7 +2476,7 @@
 "rhosp13/openstack-aodh-notifier" = "registry.access.redhat.com/rhosp13/openstack-aodh-notifier"
 "rhosp13/openstack-barbican-api" = "registry.access.redhat.com/rhosp13/openstack-barbican-api"
 "rhosp13/openstack-barbican-base" = "registry.access.redhat.com/rhosp13/openstack-barbican-base"
-"rhosp13/openstack-barbican-keystone-listener" = "registry.access.redhat.com/rhosp13/openstack-barbican-keystone-listener"
+"rhosp13/openstack-barbican-keystone-listener" = "registry.redhat.io/rhosp13/openstack-barbican-keystone-listener"
 "rhosp13/openstack-barbican-worker" = "registry.access.redhat.com/rhosp13/openstack-barbican-worker"
 "rhosp13/openstack-base" = "registry.access.redhat.com/rhosp13/openstack-base"
 "rhosp13/openstack-ceilometer-base" = "registry.access.redhat.com/rhosp13/openstack-ceilometer-base"
@@ -2704,12 +2711,11 @@
 "rhscl/devtoolset-11-toolchain-rhel7" = "registry.redhat.io/rhscl/devtoolset-11-toolchain-rhel7"
 "rhscl/go-toolset-7-rhel7" = "registry.access.redhat.com/rhscl/go-toolset-7-rhel7"
 "rhscl/httpd-24-rhel7" = "registry.access.redhat.com/rhscl/httpd-24-rhel7"
-"rhscl/mariadb-103-rhel7" = "registry.access.redhat.com/rhscl/mariadb-103-rhel7"
+"rhscl/mariadb-103-rhel7" = "registry.redhat.io/rhscl/mariadb-103-rhel7"
 "rhscl/mariadb-105-rhel7" = "registry.redhat.io/rhscl/mariadb-105-rhel7"
 "rhscl/mysql-80-rhel7" = "registry.access.redhat.com/rhscl/mysql-80-rhel7"
 "rhscl/nginx-118-rhel7" = "registry.redhat.io/rhscl/nginx-118-rhel7"
 "rhscl/nginx-120-rhel7" = "registry.redhat.io/rhscl/nginx-120-rhel7"
-"rhscl/nodejs-12-rhel7" = "registry.redhat.io/rhscl/nodejs-12-rhel7"
 "rhscl/nodejs-14-rhel7" = "registry.redhat.io/rhscl/nodejs-14-rhel7"
 "rhscl/perl-530-rhel7" = "registry.redhat.io/rhscl/perl-530-rhel7"
 "rhscl/php-73-rhel7" = "registry.redhat.io/rhscl/php-73-rhel7"
@@ -2718,15 +2724,14 @@
 "rhscl/postgresql-13-rhel7" = "registry.redhat.io/rhscl/postgresql-13-rhel7"
 "rhscl/python-27-rhel7" = "registry.access.redhat.com/rhscl/python-27-rhel7"
 "rhscl/python-38-rhel7" = "registry.redhat.io/rhscl/python-38-rhel7"
-"rhscl/redis-5-rhel7" = "registry.redhat.io/rhscl/redis-5-rhel7"
 "rhscl/redis-6-rhel7" = "registry.redhat.io/rhscl/redis-6-rhel7"
-"rhscl/ruby-26-rhel7" = "registry.access.redhat.com/rhscl/ruby-26-rhel7"
 "rhscl/ruby-27-rhel7" = "registry.redhat.io/rhscl/ruby-27-rhel7"
 "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"
 "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/sso76-openshift-rhel8" = "registry.redhat.io/rh-sso-7/sso76-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"
 "rh-sso-7/sso7-rhel8-operator" = "registry.redhat.io/rh-sso-7/sso7-rhel8-operator"
@@ -2800,10 +2805,12 @@
 "starburst/presto-operator-bundle" = "registry.connect.redhat.com/starburst/presto-operator-bundle"
 "starburst/starburst-enterprise-helm-operator-bundle-certified" = "registry.connect.redhat.com/starburst/starburst-enterprise-helm-operator-bundle-certified"
 "starburst/starburst-enterprise-helm-operator-bundle" = "registry.redhat.io/starburst/starburst-enterprise-helm-operator-bundle"
+"starburst/starburst-enterprise-helm-operator-paygo-bundle-certified" = "registry.connect.redhat.com/starburst/starburst-enterprise-helm-operator-paygo-bundle-certified"
 "starburst/starburst-enterprise-helm-operator" = "registry.connect.redhat.com/starburst/starburst-enterprise-helm-operator"
 "starburst/starburst-enterprise-init" = "registry.connect.redhat.com/starburst/starburst-enterprise-init"
 "starburst/starburst-enterprise" = "registry.connect.redhat.com/starburst/starburst-enterprise"
 "stf/prometheus-webhook-snmp" = "registry.redhat.io/stf/prometheus-webhook-snmp"
+"stf/prometheus-webhook-snmp-rhel8" = "registry.access.redhat.com/stf/prometheus-webhook-snmp-rhel8"
 "stf/service-telemetry-operator-bundle" = "registry.redhat.io/stf/service-telemetry-operator-bundle"
 "stf/service-telemetry-rhel7-operator-metadata" = "registry.redhat.io/stf/service-telemetry-rhel7-operator-metadata"
 "stf/service-telemetry-rhel8-operator" = "registry.redhat.io/stf/service-telemetry-rhel8-operator"
@@ -2836,10 +2843,17 @@
 "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"
+"streamnative/bookkeeper-operator-bundle" = "registry.connect.redhat.com/streamnative/bookkeeper-operator-bundle"
+"streamnative/bookkeeper" = "registry.connect.redhat.com/streamnative/bookkeeper"
+"streamnative/function-mesh-bundle" = "registry.connect.redhat.com/streamnative/function-mesh-bundle"
+"streamnative/function-mesh" = "registry.connect.redhat.com/streamnative/function-mesh"
+"streamnative/pulsar-operator-bundle" = "registry.connect.redhat.com/streamnative/pulsar-operator-bundle"
+"streamnative/pulsar-operator" = "registry.connect.redhat.com/streamnative/pulsar-operator"
+"streamnative/zookeeper-operator-bundle" = "registry.connect.redhat.com/streamnative/zookeeper-operator-bundle"
+"streamnative/zookeeper-operator" = "registry.connect.redhat.com/streamnative/zookeeper-operator"
 "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"
@@ -2849,7 +2863,8 @@
 "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"
+"tonyfieit/ibmz-mongodb-ee-operator-bundle" = "registry.redhat.io/tonyfieit/ibmz-mongodb-ee-operator-bundle"
+"tonyfieit/ibmz-mongodb-operator-bundle" = "registry.connect.redhat.com/tonyfieit/ibmz-mongodb-operator-bundle"
 "tremolosecurity/activemq" = "registry.connect.redhat.com/tremolosecurity/activemq"
 "tremolosecurity/openunison-operator-bundle" = "registry.redhat.io/tremolosecurity/openunison-operator-bundle"
 "tremolosecurity/openunison-operator" = "registry.redhat.io/tremolosecurity/openunison-operator"
@@ -2973,7 +2988,9 @@
 "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-marketplace" = "registry.connect.redhat.com/turbonomic/prometurbo-marketplace"
 "turbonomic/prometurbo-operator-bundle" = "registry.connect.redhat.com/turbonomic/prometurbo-operator-bundle"
+"turbonomic/prometurbo-operator" = "registry.connect.redhat.com/turbonomic/prometurbo-operator"
 "turbonomic/prometurbo" = "registry.redhat.io/turbonomic/prometurbo"
 "turbonomic/repository" = "registry.connect.redhat.com/turbonomic/repository"
 "turbonomic/rsyslog" = "registry.connect.redhat.com/turbonomic/rsyslog"
@@ -2988,13 +3005,11 @@
 "ubi7-minimal" = "registry.access.redhat.com/ubi7-minimal"
 "ubi7/nginx-118" = "registry.access.redhat.com/ubi7/nginx-118"
 "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"
 "ubi7/python-27" = "registry.redhat.io/ubi7/python-27"
 "ubi7/python-38" = "registry.access.redhat.com/ubi7/python-38"
 "ubi7" = "registry.access.redhat.com/ubi7"
-"ubi7/ruby-26" = "registry.access.redhat.com/ubi7/ruby-26"
 "ubi7/ruby-27" = "registry.access.redhat.com/ubi7/ruby-27"
 "ubi7/ruby-30" = "registry.access.redhat.com/ubi7/ruby-30"
 "ubi7/s2i-base" = "registry.access.redhat.com/ubi7/s2i-base"
@@ -3014,9 +3029,8 @@
 "ubi8-minimal" = "registry.access.redhat.com/ubi8-minimal"
 "ubi8/nginx-118" = "registry.access.redhat.com/ubi8/nginx-118"
 "ubi8/nginx-120" = "registry.access.redhat.com/ubi8/nginx-120"
-"ubi8/nodejs-12" = "registry.access.redhat.com/ubi8/nodejs-12"
 "ubi8/nodejs-14-minimal" = "registry.access.redhat.com/ubi8/nodejs-14-minimal"
-"ubi8/nodejs-14" = "registry.access.redhat.com/ubi8/nodejs-14"
+"ubi8/nodejs-14" = "registry.redhat.io/ubi8/nodejs-14"
 "ubi8/nodejs-16-minimal" = "registry.access.redhat.com/ubi8/nodejs-16-minimal"
 "ubi8/nodejs-16" = "registry.access.redhat.com/ubi8/nodejs-16"
 "ubi8/openjdk-11" = "registry.access.redhat.com/ubi8/openjdk-11"
@@ -3039,9 +3053,9 @@
 "ubi8/python-39" = "registry.access.redhat.com/ubi8/python-39"
 "ubi8" = "registry.access.redhat.com/ubi8"
 "ubi8/ruby-25" = "registry.access.redhat.com/ubi8/ruby-25"
-"ubi8/ruby-26" = "registry.access.redhat.com/ubi8/ruby-26"
 "ubi8/ruby-27" = "registry.access.redhat.com/ubi8/ruby-27"
 "ubi8/ruby-30" = "registry.access.redhat.com/ubi8/ruby-30"
+"ubi8/ruby-31" = "registry.access.redhat.com/ubi8/ruby-31"
 "ubi8/s2i-base" = "registry.access.redhat.com/ubi8/s2i-base"
 "ubi8/s2i-core" = "registry.access.redhat.com/ubi8/s2i-core"
 "ubi8/skopeo" = "registry.redhat.io/ubi8/skopeo"
@@ -3058,8 +3072,7 @@
 "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/openssl" = "registry.redhat.io/ubi9/openssl"
 "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"
@@ -3081,14 +3094,23 @@
 "vacava/rapidbiz" = "registry.connect.redhat.com/vacava/rapidbiz"
 "veritas/hyperscale" = "registry.connect.redhat.com/veritas/hyperscale"
 "veritas-technologies/infoscale-csi-plugin" = "registry.connect.redhat.com/veritas-technologies/infoscale-csi-plugin"
+"veritas-technologies/infoscale-csi" = "registry.connect.redhat.com/veritas-technologies/infoscale-csi"
+"veritas-technologies/infoscale-dr-manager-bundle" = "registry.redhat.io/veritas-technologies/infoscale-dr-manager-bundle"
+"veritas-technologies/infoscale-dr-manager" = "registry.connect.redhat.com/veritas-technologies/infoscale-dr-manager"
 "veritas-technologies/infoscale-dr-operator" = "registry.connect.redhat.com/veritas-technologies/infoscale-dr-operator"
+"veritas-technologies/infoscale-fencing" = "registry.connect.redhat.com/veritas-technologies/infoscale-fencing"
 "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-licensing-operator" = "registry.connect.redhat.com/veritas-technologies/infoscale-licensing-operator"
 "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-sds-operator" = "registry.connect.redhat.com/veritas-technologies/infoscale-sds-operator"
+"veritas-technologies/infoscale-sds" = "registry.connect.redhat.com/veritas-technologies/infoscale-sds"
 "veritas-technologies/infoscale-vxfen" = "registry.connect.redhat.com/veritas-technologies/infoscale-vxfen"
+"veritas-technologies/netbackupdatamover" = "registry.redhat.io/veritas-technologies/netbackupdatamover"
+"veritas-technologies/netbackupkops" = "registry.connect.redhat.com/veritas-technologies/netbackupkops"
 "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"
@@ -3111,10 +3133,15 @@
 "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"
+"wmalyk28/cloudnfv-runtime" = "quay.io/wmalyk28/cloudnfv-runtime"
+"wmalyk28/cnfv-op" = "quay.io/wmalyk28/cnfv-op"
+"workload-availability/node-healthcheck-operator-bundle" = "registry.access.redhat.com/workload-availability/node-healthcheck-operator-bundle"
+"workload-availability/node-healthcheck-rhel8-operator" = "registry.redhat.io/workload-availability/node-healthcheck-rhel8-operator"
 "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-must-gather-rhel8" = "registry.access.redhat.com/workload-availability/self-node-remediation-must-gather-rhel8"
+"workload-availability/self-node-remediation-operator-bundle" = "registry.access.redhat.com/workload-availability/self-node-remediation-operator-bundle"
 "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"
@@ -3128,9 +3155,11 @@
 "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-agent2-62" = "registry.connect.redhat.com/zabbix/zabbix-agent2-62"
 "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-agent-62" = "registry.connect.redhat.com/zabbix/zabbix-agent-62"
 "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"
@@ -3139,6 +3168,7 @@
 "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-java-gateway-62" = "registry.connect.redhat.com/zabbix/zabbix-java-gateway-62"
 "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"
@@ -3146,20 +3176,26 @@
 "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-mysql-62" = "registry.connect.redhat.com/zabbix/zabbix-proxy-mysql-62"
 "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-proxy-sqlite-62" = "registry.connect.redhat.com/zabbix/zabbix-proxy-sqlite-62"
 "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-server-mysql-62" = "registry.connect.redhat.com/zabbix/zabbix-server-mysql-62"
 "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-snmptraps-62" = "registry.connect.redhat.com/zabbix/zabbix-snmptraps-62"
 "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-mysql-60" = "registry.connect.redhat.com/zabbix/zabbix-web-mysql-60"
+"zabbix/zabbix-web-mysql-62" = "registry.connect.redhat.com/zabbix/zabbix-web-mysql-62"
 "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"
+"zabbix/zabbix-web-service-62" = "registry.connect.redhat.com/zabbix/zabbix-web-service-62"
 "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/containers-policy.json.5.md b/SOURCES/containers-policy.json.5.md
index 62f5855..e13839b 100644
--- a/SOURCES/containers-policy.json.5.md
+++ b/SOURCES/containers-policy.json.5.md
@@ -149,20 +149,21 @@ This requirement rejects every image, and every signature.
 
 ### `signedBy`
 
-This requirement requires an image to be signed with an expected identity, or accepts a signature if it is using an expected identity and key.
+This requirement requires an image to be signed using “simple signing” with an expected identity, or accepts a signature if it is using an expected identity and key.
 
 ```js
 {
     "type":    "signedBy",
     "keyType": "GPGKeys", /* The only currently supported value */
     "keyPath": "/path/to/local/keyring/file",
+    "keyPaths": ["/path/to/local/keyring/file1","/path/to/local/keyring/file2"…],
     "keyData": "base64-encoded-keyring-data",
     "signedIdentity": identity_requirement
 }
 ```
 <!-- Later: other keyType values -->
 
-Exactly one of `keyPath` and `keyData` must be present, containing a GPG keyring of one or more public keys.  Only signatures made by these keys are accepted.
+Exactly one of `keyPath`, `keyPaths` and `keyData` must be present, containing a GPG keyring of one or more public keys.  Only signatures made by these keys are accepted.
 
 The `signedIdentity` field, a JSON object, specifies what image identity the signature claims about the image.
 One of the following alternatives are supported:
@@ -236,6 +237,26 @@ used with `exactReference` or `exactRepository`.
 
 <!-- ### `signedBaseLayer` -->
 
+
+### `sigstoreSigned`
+
+This requirement requires an image to be signed using a sigstore signature with an expected identity and key.
+
+```js
+{
+    "type":    "sigstoreSigned",
+    "keyPath": "/path/to/local/keyring/file",
+    "keyData": "base64-encoded-keyring-data",
+    "signedIdentity": identity_requirement
+}
+```
+Exactly one of `keyPath` and `keyData` must be present, containing a sigstore public key.  Only signatures made by this key is accepted.
+
+The `signedIdentity` field has the same semantics as in the `signedBy` requirement described above.
+Note that `cosign`-created signatures only contain a repository, so only `matchRepository` and `exactRepository` can be used to accept them (and that does not protect against substitution of a signed image with an unexpected tag).
+
+To use this with images hosted on image registries, the relevant registry or repository must have the `use-sigstore-attachments` option enabled in containers-registries.d(5).
+
 ## Examples
 
 It is *strongly* recommended to set the `default` policy to `reject`, and then
@@ -255,9 +276,24 @@ selectively allow individual transports and scopes as desired.
             "docker.io/openshift": [{"type": "insecureAcceptAnything"}],
             /* Similarly, allow installing the “official” busybox images.  Note how the fully expanded
                form, with the explicit /library/, must be used. */
-            "docker.io/library/busybox": [{"type": "insecureAcceptAnything"}]
+            "docker.io/library/busybox": [{"type": "insecureAcceptAnything"}],
             /* Allow installing images from all subdomains */
-            "*.temporary-project.example.com": [{"type": "insecureAcceptAnything"}]
+            "*.temporary-project.example.com": [{"type": "insecureAcceptAnything"}],
+            /* A sigstore-signed repository */
+            "hostname:5000/myns/sigstore-signed-with-full-references": [
+                {
+                    "type": "sigstoreSigned",
+                    "keyPath": "/path/to/sigstore-pubkey.pub"
+                }
+            ],
+            /* A sigstore-signed repository, accepts signatures by /usr/bin/cosign */
+            "hostname:5000/myns/sigstore-signed-allows-malicious-tag-substitution": [
+                {
+                    "type": "sigstoreSigned",
+                    "keyPath": "/path/to/sigstore-pubkey.pub",
+                    "signedIdentity": {"type": "matchRepository"}
+                }
+            ]
             /* Other docker: images use the global default policy and are rejected */
         },
         "dir": {
@@ -301,7 +337,7 @@ selectively allow individual transports and scopes as desired.
                     "signedIdentity": {
                         "type": "remapIdentity",
                         "prefix": "private-mirror:5000/vendor-mirror",
-                        "signedPrefix": "vendor.example.com",
+                        "signedPrefix": "vendor.example.com"
                     }
                 }
             ]
diff --git a/SOURCES/containers-registries.conf.5.md b/SOURCES/containers-registries.conf.5.md
index 0b90b60..fdc2fa9 100644
--- a/SOURCES/containers-registries.conf.5.md
+++ b/SOURCES/containers-registries.conf.5.md
@@ -43,7 +43,7 @@ also include wildcarded subdomains in the format `*.example.com`.
 The wildcard should only be present at the beginning as shown in the formats
 above. Other cases will not work. For example, `*.example.com` is valid but
 `example.*.com`, `*.example.com/foo` and `*.example.com:5000/foo/bar:baz` are not.
-Note that `*` matches an arbitary number of subdomains. `*.example.com` will hence
+Note that `*` matches an arbitrary number of subdomains. `*.example.com` will hence
 match `bar.example.com`, `foo.bar.example.com` and so on.
 
 As a special case, the `prefix` field can be missing; if so, it defaults to the value
diff --git a/SOURCES/containers-registries.d.5.md b/SOURCES/containers-registries.d.5.md
index 0707961..04434de 100644
--- a/SOURCES/containers-registries.d.5.md
+++ b/SOURCES/containers-registries.d.5.md
@@ -63,25 +63,31 @@ more general scopes is ignored.  For example, if _any_ configuration exists for
 
 ### Built-in Defaults
 
-If no `docker` section can be found for the container image, and no `default-docker` section is configured,
-the default directory, `/var/lib/containers/sigstore` for root and `$HOME/.local/share/containers/sigstore` for unprivileged user,  will be used for reading and writing signatures.
+If no `docker` section can be found for the container image, and no `default-docker` section is configured:
+
+- The default directory, `/var/lib/containers/sigstore` for root and `$HOME/.local/share/containers/sigstore` for unprivileged user,  will be used for reading and writing signatures.
+- Sigstore attachments will not be read/written.
 
 ## Individual Configuration Sections
 
 A single configuration section is selected for a container image using the process
 described above.  The configuration section is a YAML mapping, with the following keys:
 
-- `sigstore-staging` defines an URL of of the signature storage, used for editing it (adding or deleting signatures).
+<!-- `sigstore` and `sigstore-staging` are deprecated and intentionally not documented here. -->
+
+- `lookaside-staging` defines an URL of of the signature storage, used for editing it (adding or deleting signatures).
 
-   This key is optional; if it is missing, `sigstore` below is used.
+   This key is optional; if it is missing, `lookaside` below is used.
 
-- `sigstore` defines an URL of the signature storage.
+- `lookaside` defines an URL of the signature storage.
    This URL is used for reading existing signatures,
-   and if `sigstore-staging` does not exist, also for adding or removing them.
+   and if `lookaside-staging` does not exist, also for adding or removing them.
 
    This key is optional; if it is missing, no signature storage is defined (no signatures
-   are download along with images, adding new signatures is possible only if `sigstore-staging` is defined).
+   are download along with images, adding new signatures is possible only if `lookaside-staging` is defined).
 
+- `use-sigstore-attachments` specifies whether sigstore image attachments (signatures, attestations and the like) are going to be read/written along with the image.
+   If disabled, the images are treated as if no attachments exist; attempts to write attachments fail.
 
 ## Examples
 
@@ -92,11 +98,11 @@ The following demonstrates how to to consume and run images from various registr
 ```yaml
 docker:
     registry.database-supplier.com:
-        sigstore: https://sigstore.database-supplier.com
+        lookaside: https://lookaside.database-supplier.com
     distribution.great-middleware.org:
-        sigstore: https://security-team.great-middleware.org/sigstore
+        lookaside: https://security-team.great-middleware.org/lookaside
     docker.io/web-framework:
-        sigstore: https://sigstore.web-framework.io:8080
+        lookaside: https://lookaside.web-framework.io:8080
 ```
 
 ### Developing and Signing Containers, Staging Signatures
@@ -110,13 +116,13 @@ For developers in `example.com`:
 ```yaml
 docker:
     registry.example.com:
-        sigstore: https://registry-sigstore.example.com
+        lookaside: https://registry-lookaside.example.com
     registry.example.com/mydepartment:
-        sigstore: https://sigstore.mydepartment.example.com
-        sigstore-staging: file:///mnt/mydepartment/sigstore-staging
+        lookaside: https://lookaside.mydepartment.example.com
+        lookaside-staging: file:///mnt/mydepartment/lookaside-staging
     registry.example.com/mydepartment/myproject:mybranch:
-        sigstore: http://localhost:4242/sigstore
-        sigstore-staging: file:///home/useraccount/webroot/sigstore
+        lookaside: http://localhost:4242/lookaside
+        lookaside-staging: file:///home/useraccount/webroot/lookaside
 ```
 
 ### A Global Default
@@ -126,7 +132,7 @@ without listing each domain individually. This is expected to rarely happen, usu
 
 ```yaml
 default-docker:
-    sigstore-staging: file:///mnt/company/common-sigstore-staging
+    lookaside-staging: file:///mnt/company/common-lookaside-staging
 ```
 
 # AUTHORS
diff --git a/SOURCES/containers-storage.conf.5.md b/SOURCES/containers-storage.conf.5.md
index 8a82bdc..e5cc7c0 100644
--- a/SOURCES/containers-storage.conf.5.md
+++ b/SOURCES/containers-storage.conf.5.md
@@ -41,7 +41,7 @@ The `storage` table supports the following options:
   When changing the graphroot location on an SELINUX system, ensure
   the labeling matches the default locations labels with the
   following commands:
-  
+
 ```
 # semanage fcontext -a -e /var/lib/containers/storage /NEWSTORAGEPATH
 # restorecon -R -v /NEWSTORAGEPATH
@@ -74,6 +74,29 @@ The `storage.options` table supports the following options:
 **additionalimagestores**=[]
   Paths to additional container image stores. Usually these are read/only and stored on remote network shares.
 
+**pull_options** = {enable_partial_images = "false", use_hard_links = "false", ostree_repos=""}
+
+Allows specification of how storage is populated when pulling images. This
+option can speed the pulling process of images compressed with format zstd:chunked. Containers/storage looks
+for files within images that are being pulled from a container registry that
+were previously pulled to the host.  It can copy or create
+a hard link to the existing file when it finds them, eliminating the need to pull them from the
+container registry. These options can deduplicate pulling of content, disk
+storage of content and can allow the kernel to use less memory when running
+containers.
+
+containers/storage supports four keys
+  * enable_partial_images="true" | "false"
+    Tells containers/storage to look for files previously pulled in storage
+    rather then always pulling them from the container registry.
+  * use_hard_links = "false" | "true"
+    Tells containers/storage to use hard links rather then create new files in
+    the image, if an identical file already existed in storage.
+  * ostree_repos = ""
+    Tells containers/storage where an ostree repository exists that might have
+    previously pulled content which can be used when attempting to avoid
+    pulling content from the container registry
+
 **remap-uids=**""
 **remap-gids=**""
   Remap-UIDs/GIDs is the mapping from UIDs/GIDs as they should appear inside of a container, to the UIDs/GIDs outside of the container, and the length of the range of UIDs/GIDs.  Additional mapped sets can be listed and will be heeded by libraries, but there are limits to the number of mappings which the kernel will allow when you later attempt to run a container.
@@ -236,6 +259,9 @@ based file systems.
 **mountopt**=""
   Comma separated list of default options to be used to mount container images.  Suggested value "nodev". Mount options are documented in the mount(8) man page.
 
+**skip_mount_home=""**
+  Tell storage drivers to not create a PRIVATE bind mount on their home directory.
+
 **size**=""
   Maximum size of a read/write layer.   This flag can be used to set quota on the size of a read/write layer of a container. (format: <number>[<unit>], where unit = b (bytes), k (kilobytes), m (megabytes), or g (gigabytes))
 
@@ -256,9 +282,6 @@ The `storage.options.zfs` table supports the following options:
 **mountopt**=""
   Comma separated list of default options to be used to mount container images.  Suggested value "nodev". Mount options are documented in the mount(8) man page.
 
-**skip_mount_home=""**
-  Tell storage drivers to not create a PRIVATE bind mount on their home directory.
-
 **size**=""
   Maximum size of a container image.   This flag can be used to set quota on the size of container images. (format: <number>[<unit>], where unit = b (bytes), k (kilobytes), m (megabytes), or g (gigabytes))
 
diff --git a/SOURCES/containers.conf b/SOURCES/containers.conf
index 5ac963d..6db7a94 100644
--- a/SOURCES/containers.conf
+++ b/SOURCES/containers.conf
@@ -328,6 +328,13 @@ network_backend = "cni"
 #
 #network_config_dir = "/etc/cni/net.d/"
 
+# Port to use for dns forwarding daemon with netavark in rootful bridge
+# mode and dns enabled.
+# Using an alternate port might be useful if other dns services should
+# run on the machine.
+#
+#dns_bind_port = 53
+
 [engine]
 # Index to the active service
 #
@@ -438,6 +445,16 @@ events_logger = "file"
 #
 #image_parallel_copies = 0
 
+# Tells container engines how to handle the builtin image volumes.
+#   * bind: An anonymous named volume will be created and mounted
+#     into the container.
+#   * tmpfs: The volume is mounted onto the container as a tmpfs,
+#     which allows users to create content that disappears when
+#     the container is stopped.
+#   * ignore: All volumes are just ignored and no action is taken.
+#
+#image_volume_mode = ""
+
 # Default command to run the infra container
 #
 #infra_command = "/pause"
diff --git a/SOURCES/containers.conf.5.md b/SOURCES/containers.conf.5.md
index 6aac497..1f2bd5e 100644
--- a/SOURCES/containers.conf.5.md
+++ b/SOURCES/containers.conf.5.md
@@ -359,6 +359,13 @@ and "$HOME/.config/cni/net.d" as rootless.
 For the netavark backend "/etc/containers/networks" is used as root
 and "$graphroot/networks" as rootless.
 
+**dns_bind_port**=53
+
+Port to use for dns forwarding daemon with netavark in rootful bridge
+mode and dns enabled.
+Using an alternate port might be useful if other dns services should
+run on the machine.
+
 ## ENGINE TABLE
 The `engine` table contains configuration options used to set up container engines such as Podman and Buildah.
 
@@ -434,8 +441,15 @@ and the logfile will not be rotated.
 
 **events_logger**="journald"
 
-Default method to use when logging events.
-Valid values: `file`, `journald`, and `none`.
+The default method to use when logging events.  
+
+The default method is different based on the platform that
+Podman is being run upon.  To determine the current value,
+use this command:
+
+`podman info --format {{.Host.EventLogger}`
+
+Valid values are: `file`, `journald`, and `none`.
 
 **helper_binaries_dir**=["/usr/libexec/podman", ...]
 
@@ -480,6 +494,14 @@ Default transport method for pulling and pushing images.
 Maximum number of image layers to be copied (pulled/pushed) simultaneously.
 Not setting this field will fall back to containers/image defaults. (6)
 
+**image_volume_mode**="bind"
+
+Tells container engines how to handle the builtin image volumes.
+
+* bind: An anonymous named volume will be  created  and  mounted into the container.
+* tmpfs: The volume is mounted onto the container as a tmpfs, which allows the users to create content that disappears when the container is stopped.
+* ignore: All volumes are just ignored and no action is taken.
+
 **infra_command**="/pause"
 
 Infra (pause) container image command for pod infra containers. When running a
diff --git a/SOURCES/default-policy.json b/SOURCES/default-policy.json
index 7ed16d6..eb5934e 100644
--- a/SOURCES/default-policy.json
+++ b/SOURCES/default-policy.json
@@ -10,14 +10,14 @@
 		{
 		    "type": "signedBy",
 		    "keyType": "GPGKeys",
-		    "keyPath": "/etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release"
+		    "keyPaths": ["/etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release", "/etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta"]
 		}
 	    ],
 	    "registry.redhat.io": [
 		{
 		    "type": "signedBy",
 		    "keyType": "GPGKeys",
-		    "keyPath": "/etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release"
+		    "keyPaths": ["/etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release", "/etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta"]
 		}
 	    ]
 	},
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/seccomp.json b/SOURCES/seccomp.json
index cb826cd..3edc0c6 100644
--- a/SOURCES/seccomp.json
+++ b/SOURCES/seccomp.json
@@ -228,6 +228,9 @@
 				"ipc",
 				"keyctl",
 				"kill",
+				"landlock_add_rule",
+				"landlock_create_ruleset",
+				"landlock_restrict_self",
 				"lchown",
 				"lchown32",
 				"lgetxattr",
diff --git a/SOURCES/storage.conf b/SOURCES/storage.conf
index 4b44c38..e26d02b 100644
--- a/SOURCES/storage.conf
+++ b/SOURCES/storage.conf
@@ -40,6 +40,28 @@ graphroot = "/var/lib/containers/storage"
 additionalimagestores = [
 ]
 
+# Allows specification of how storage is populated when pulling images. This
+# option can speed the pulling process of images compressed with format
+# zstd:chunked. Containers/storage looks for files within images that are being
+# pulled from a container registry that were previously pulled to the host.  It
+# can copy or create a hard link to the existing file when it finds them,
+# eliminating the need to pull them from the container registry. These options
+# can deduplicate pulling of content, disk storage of content and can allow the
+# kernel to use less memory when running containers.
+
+# containers/storage supports four keys
+#   * enable_partial_images="true" | "false"
+#     Tells containers/storage to look for files previously pulled in storage
+#     rather then always pulling them from the container registry.
+#   * use_hard_links = "false" | "true"
+#     Tells containers/storage to use hard links rather then create new files in
+#     the image, if an identical file already existed in storage.
+#   * ostree_repos = ""
+#     Tells containers/storage where an ostree repository exists that might have
+#     previously pulled content which can be used when attempting to avoid
+#     pulling content from the container registry
+pull_options = {enable_partial_images = "false", use_hard_links = "false", ostree_repos=""}
+
 # Remap-UIDs/GIDs is the mapping from UIDs/GIDs as they should appear inside of
 # a container, to the UIDs/GIDs as they should appear outside of the container,
 # and the length of the range of UIDs/GIDs.  Additional mapped sets can be
diff --git a/SPECS/containers-common.spec b/SPECS/containers-common.spec
index c6a0e7a..ff213c1 100644
--- a/SPECS/containers-common.spec
+++ b/SPECS/containers-common.spec
@@ -4,17 +4,20 @@
 # pick the oldest version on c/image, c/common, c/storage vendored in
 # podman/skopeo/podman.
 %global skopeo_branch main
-%global image_branch v5.21.1
-%global common_branch v0.48.0
-%global storage_branch v1.40.2
+%global image_branch v5.22.0
+%global common_branch v0.49.1
+%global storage_branch v1.42.0
 %global shortnames_branch main
 
 Epoch: 2
 Name: containers-common
 Version: 1
-Release: 39%{?dist}
+Release: 40%{?dist}
 Summary: Common configuration and documentation for containers
 License: ASL 2.0
+# arch limitation because of go-md2man (missing on i686)
+# https://fedoraproject.org/wiki/PackagingDrafts/Go#Go_Language_Architectures
+ExclusiveArch: %{go_arches}
 BuildRequires: /usr/bin/go-md2man
 Provides: skopeo-containers = %{epoch}:%{version}-%{release}
 Conflicts: %{name} <= 2:1-22
@@ -65,28 +68,6 @@ 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 95a32bf243b4c96138e84bae2a9426fa0b472338
-%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_branch}-vendor.tar.gz
-
-%global netavark_version v1.0.1
-%global netavark_branch v1.0.1-rhel
-%global netavark_commit0 03e1d60312898d1ab83bfeb044ecda103ac90401
-%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-1.0.1-rhel-vendor.tar.gz
-
 %description
 This package contains common configuration files and documentation for container
 tools ecosystem, such as Podman, Buildah and Skopeo.
@@ -95,143 +76,11 @@ It is required because the most of configuration files and docs come from projec
 which are vendored into Podman, Buildah, Skopeo, etc. but they are not packaged
 separately.
 
-%package -n aardvark-dns
-Version: 1.0.1
-Release: 39%{?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
-BuildRequires: cargo
-BuildRequires: git-core
-BuildRequires: make
-BuildRequires: rust-srpm-macros
-BuildRequires: rust-toolset
-#ExclusiveArch: %%{rust_arches}
-ExclusiveArch: aarch64 ppc64le s390x x86_64
-
-%description -n aardvark-dns
-%{summary}
-
-Forwards other request to configured resolvers.
-Read more about configuration in `src/backend/mod.rs`.
-
-%package -n netavark
-Version: 1.0.1
-Release: 39%{?dist}
-URL: https://github.com/containers/netavark
-Summary: OCI network stack
-License: ASL 2.0 and BSD and MIT
-BuildRequires: cargo
-BuildRequires: make
-BuildRequires: rust-srpm-macros
-BuildRequires: git-core
-BuildRequires: /usr/bin/go-md2man
-Recommends: aardvark-dns
-Provides: container-network-stack = 2
-BuildRequires: rust-toolset
-#ExclusiveArch: #%%{rust_arches}
-ExclusiveArch: aarch64 ppc64le s390x x86_64
-
-%description -n netavark
-%{summary}
-
-Netavark is a rust based network stack for containers. It is being
-designed to work with Podman but is also applicable for other OCI
-container management applications.
-
-Netavark is a tool for configuring networking for Linux containers.
-Its features include:
-* Configuration of container networks via JSON configuration file
-* Creation and management of required network interfaces,
-    including MACVLAN networks
-* All required firewall configuration to perform NAT and port
-    forwarding as required for containers
-* Support for iptables and firewalld at present, with support
-    for nftables planned in a future release
-* Support for rootless containers
-* Support for IPv4 and IPv6
-* Support for container DNS resolution via aardvark-dns.
-
 %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
-[source.crates-io]
-replace-with = "vendored-sources"
-
-[source.vendored-sources]
-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
-[source.crates-io]
-replace-with = "vendored-sources"
-
-[source.vendored-sources]
-directory = "vendor"
-EOF
-popd
 
 %build
-%if 0%{?build_rustflags:1}
-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
-go-md2man -in netavark.1.md -out netavark.1
-popd
-%{__make} DESTDIR=%{buildroot} PREFIX=%{_prefix} install
-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
-
 install -dp %{buildroot}%{_sysconfdir}/containers/{certs.d,oci/hooks.d,registries.d,registries.conf.d}
 install -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/containers/storage.conf
 install -m0644 %{SOURCE5} %{buildroot}%{_sysconfdir}/containers/registries.conf
@@ -296,8 +145,6 @@ EOF
 %dir %{_sysconfdir}/containers
 %dir %{_sysconfdir}/containers/certs.d
 %dir %{_sysconfdir}/containers/registries.d
-%{_sysconfdir}/containers/registries.d/registry.redhat.io.yaml
-%{_sysconfdir}/containers/registries.d/registry.access.redhat.com.yaml
 %dir %{_sysconfdir}/containers/oci
 %dir %{_sysconfdir}/containers/oci/hooks.d
 %dir %{_sysconfdir}/containers/registries.conf.d
@@ -305,11 +152,12 @@ EOF
 %{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
 %endif
 %config(noreplace) %{_sysconfdir}/containers/policy.json
-%config(noreplace) %{_sysconfdir}/containers/registries.d/default.yaml
 %config(noreplace) %{_sysconfdir}/containers/storage.conf
 %config(noreplace) %{_sysconfdir}/containers/registries.conf
 %config(noreplace) %{_sysconfdir}/containers/registries.conf.d/*.conf
-%config(noreplace) %{_sysconfdir}/containers/registries.d/*.yaml
+%config(noreplace) %{_sysconfdir}/containers/registries.d/default.yaml
+%config(noreplace) %{_sysconfdir}/containers/registries.d/registry.redhat.io.yaml
+%config(noreplace) %{_sysconfdir}/containers/registries.d/registry.access.redhat.com.yaml
 %ghost %{_sysconfdir}/containers/containers.conf
 %dir %{_sharedstatedir}/containers/sigstore
 %{_mandir}/man5/*
@@ -320,115 +168,137 @@ EOF
 %dir %{_datadir}/rhel/secrets
 %{_datadir}/rhel/secrets/*
 
-%files -n aardvark-dns
-%if 0%{?aardvark_dns_branch:1}
-%license containers-aardvark-dns-%{aardvark_dns_shortcommit0}/LICENSE
-%else
-%license aardvark-dns-%{aardvark_dns_commit0}/LICENSE
-%endif
-%dir %{_libexecdir}/podman
-%{_libexecdir}/podman/aardvark-dns
-
-%files -n netavark
-%if 0%{?netavark_branch:1}
-%license containers-netavark-%{netavark_shortcommit0}/LICENSE
-%else
-%license netavark-%{netavark_commit0}/LICENSE
-%endif
-%dir %{_libexecdir}/podman
-%{_libexecdir}/podman/netavark
-%{_mandir}/man1/netavark.1*
-
 %changelog
-* Wed Oct 12 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-39
-- use proper vendor tarball for aardvark-dns
-- Related: #2133391
-
-* Wed Oct 12 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-38
-- revert to latest buildable version
-- Related: #2133391
+* Tue Aug 23 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-40
+- add beta keys to default-policy.json
+- Related: #2061390
 
-* Tue Oct 11 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-37
-- also update aardvark-dns to v1.0.1-rhel branch
-- Related: #2133391
+* Mon Aug 08 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-39
+- update shortnames
+- Related: #2061390
 
-* Tue Oct 11 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-36
-- fix podman container got global IPv6 address unexpectedly even when macvlan
-  network is created for pure IPv4 network
-- Resolves: #2133391
+* Thu Aug 04 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-38
+- arch limitation because of go-md2man (missing on i686)
+- Related: #2061390
 
-* Mon Jun 27 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-35
-- remove rhel-els and update shortnames
+* Wed Aug 03 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-37
+- add install section
+- update vendored components
+- Related: #2061390
 
-* Thu Jun 16 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-34
-- update shortnames
+* Wed Aug 03 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-36
+- remove aardvark-dns and netavark - packaged separately
+- update vendored components and configuration files
 - Related: #2061390
 
-* Wed Jun 15 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-33
-- additional fix for unqualified registries
+* Tue Jul 26 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-35
+- update vendored components and configuration files
 - Related: #2061390
 
-* Wed Jun 15 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-33
-- additional fix for unqualified registries
+* Mon Jun 27 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-34
+- remove rhel-els and update shortnames
 - Related: #2061390
 
-* Wed Jun 15 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-33
-- additional fix for unqualified registries
+* Thu Jun 16 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-33
+- update shortnames
 - Related: #2061390
 
-* Wed Jun 15 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-33
+* Thu Jun 09 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-32
 - additional fix for unqualified registries
 - Related: #2061390
 
-* Mon Jun 13 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-33
-- additional fix for unqualified registries
+* Thu Jun 09 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-31
+- fix unqualified registries
 - Related: #2061390
 
-* Thu Jun 09 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-33
-- additional fix for unqualified registries
+* Thu Jun 09 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-30
+- update vendored components and configuration files
 - Related: #2061390
 
-* Tue Jun 07 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-30
+* Mon May 23 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-29
 - update unqualified registries list
 - Related: #2061390
 
-* Mon May 09 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-29
+* Mon May 09 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-28
 - update aardvark-dns and netavark to 1.0.3
 - update vendored components
 - Related: #2061390
 
-* Fri May 06 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-28
-- add man page sources too
-- Related: #2061390
-
-* Wed Apr 27 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-28
-- add man page sources too
-- Related: #2061390
-
-* Wed Apr 27 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-28
+* Fri Apr 22 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-27
 - add man page sources too
 - Related: #2061390
 
-* Wed Apr 20 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-27
+* Wed Apr 20 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-26
 - add missing man pages from Fedora
 - Related: #2061390
 
-* Thu Apr 07 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-26
+* Wed Apr 06 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-25
 - allow consuming aardvark-dns and netavark from upstream branch
 - Related: #2061390
 
-* Thu Apr 07 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-26
-- allow consuming aardvark-dns and netavark from upstream branch
-- Related: #2061390
-
-* Wed Apr 06 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-26
-- allow consuming aardvark-dns and netavark from upstream branch
+* Wed Apr 06 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-24
+- update to netavark and aardvark-dns 1.0.2
+- update vendored components
 - Related: #2061390
 
-* Mon Mar 07 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-10
+* Mon Feb 28 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-23
 - update to netavark and aardvark-dns 1.0.1
 - Related: #2001445
 
+* Wed Feb 23 2022 Lokesh Mandvekar <lsm5@redhat.com> - 2:1-22
+- build rust packages with RUSTFLAGS set to make ExecShield happy
+- Related: #2001445
+
+* Mon Feb 21 2022 Lokesh Mandvekar <lsm5@redhat.com> - 2:1-21
+- do not specify infra_image in containers.conf
+- needed to resolve gating test failures
+- Related: #2001445
+
+* Fri Feb 18 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-20
+- update to netavark-1.0.0 and aardvark-dns-1.0.0
+- Related: #2001445
+
+* Thu Feb 17 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-19
+- package aarvark-dns and netavark as part of the containers-common
+- Related: #2001445
+
+* Thu Feb 17 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-18
+- update shortnames and vendored components
+- Related: #2001445
+
+* Wed Feb 16 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-17
+- containers.conf should contain network_backend = "cni" in RHEL8.6
+- Related: #2001445
+
+* Fri Feb 11 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-16
+- update vendored components and configuration files
+- Related: #2001445
+
+* Fri Feb 04 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-15
+- sync vendored components
+- Related: #2001445
+
+* Fri Feb 04 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-14
+- sync vendored components
+- Related: #2001445
+
+* Mon Jan 17 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-13
+- update shortnames from Pyxis
+- Related: #2001445
+
+* Thu Dec 09 2021 Jindrich Novy <jnovy@redhat.com> - 2:1-12
+- do not allow broken content from Pyxis to land in shortnames.conf
+- Related: #2001445
+
+* Wed Dec 08 2021 Jindrich Novy <jnovy@redhat.com> - 2:1-11
+- sync vendored components
+- update shortnames from Pyxis
+- Related: #2001445
+
+* Wed Dec 01 2021 Jindrich Novy <jnovy@redhat.com> - 2:1-10
+- use log_driver = "journald" and events_logger = "journald" for RHEL9
+- Related: #2001445
+
 * Tue Nov 16 2021 Jindrich Novy <jnovy@redhat.com> - 2:1-9
 - consume seccomp.json from the oldest vendored version of c/common,
   not main branch