diff --git a/.containers-common.metadata b/.containers-common.metadata
index e69de29..a6dcd5a 100644
--- a/.containers-common.metadata
+++ b/.containers-common.metadata
@@ -0,0 +1,4 @@
+efcbc896b7b92484f54268578b6847cf961557a1 SOURCES/aardvark-dns-v1.0.1-vendor.tar.gz
+3ed56a259e5a196706c2f27f83d9f46b4704675d SOURCES/netavark-v1.0.1-vendor.tar.gz
+8634b77bd1f0d5738a4e0e2b1ca0bf7c784afeb1 SOURCES/v1.0.1-rhel-0a8eabf.tar.gz
+d42da7797a651a93df43f8cfbaa42101660c1b62 SOURCES/v1.0.1-rhel-93af394.tar.gz
diff --git a/.gitignore b/.gitignore
index e69de29..3289a80 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,4 @@
+SOURCES/aardvark-dns-v1.0.1-vendor.tar.gz
+SOURCES/netavark-v1.0.1-vendor.tar.gz
+SOURCES/v1.0.1-rhel-0a8eabf.tar.gz
+SOURCES/v1.0.1-rhel-93af394.tar.gz
diff --git a/SOURCES/001-rhel-shortnames-pyxis.conf b/SOURCES/001-rhel-shortnames-pyxis.conf
index 92e39c2..c4c9e6b 100644
--- a/SOURCES/001-rhel-shortnames-pyxis.conf
+++ b/SOURCES/001-rhel-shortnames-pyxis.conf
@@ -1,7 +1,7 @@
 [aliases]
 "3scale-amp2/3scale-rhel7-operator-metadata" = "registry.redhat.io/3scale-amp2/3scale-rhel7-operator-metadata"
 "3scale-amp2/3scale-rhel7-operator" = "registry.redhat.io/3scale-amp2/3scale-rhel7-operator"
-"3scale-amp24/wildcard-router" = "registry.access.redhat.com/3scale-amp24/wildcard-router"
+"3scale-amp24/wildcard-router" = "registry.redhat.io/3scale-amp24/wildcard-router"
 "3scale-amp25/memcached" = "registry.access.redhat.com/3scale-amp25/memcached"
 "3scale-amp26/memcached" = "registry.redhat.io/3scale-amp26/memcached"
 "3scale-amp2/apicast-gateway-rhel8" = "registry.redhat.io/3scale-amp2/apicast-gateway-rhel8"
@@ -14,11 +14,18 @@
 "5e8cf2fb69aea31642b1134b/network-operator" = "registry.redhat.io/5e8cf2fb69aea31642b1134b/network-operator"
 "6189855680cc9b10e93e68fe/headspin-operator" = "registry.connect.redhat.com/6189855680cc9b10e93e68fe/headspin-operator"
 "6189855680cc9b10e93e68fe/hspusher" = "registry.connect.redhat.com/6189855680cc9b10e93e68fe/hspusher"
-"61a74fd780cc9b10e9439133/fluent-bit" = "registry.connect.redhat.com/61a74fd780cc9b10e9439133/fluent-bit"
 "61b0dd9a4841f1221d73cdba/splunk-operator" = "registry.connect.redhat.com/61b0dd9a4841f1221d73cdba/splunk-operator"
 "aarna/amcop" = "registry.connect.redhat.com/aarna/amcop"
+"advanced-cluster-security/rhacs-collector-rhel8" = "registry.access.redhat.com/advanced-cluster-security/rhacs-collector-rhel8"
+"advanced-cluster-security/rhacs-collector-slim-rhel8" = "registry.access.redhat.com/advanced-cluster-security/rhacs-collector-slim-rhel8"
+"advanced-cluster-security/rhacs-docs-rhel8" = "registry.access.redhat.com/advanced-cluster-security/rhacs-docs-rhel8"
+"advanced-cluster-security/rhacs-main-rhel8" = "registry.access.redhat.com/advanced-cluster-security/rhacs-main-rhel8"
 "advanced-cluster-security/rhacs-operator-bundle" = "registry.redhat.io/advanced-cluster-security/rhacs-operator-bundle"
 "advanced-cluster-security/rhacs-rhel8-operator" = "registry.access.redhat.com/advanced-cluster-security/rhacs-rhel8-operator"
+"advanced-cluster-security/rhacs-roxctl-rhel8" = "registry.access.redhat.com/advanced-cluster-security/rhacs-roxctl-rhel8"
+"advanced-cluster-security/rhacs-scanner-db-rhel8" = "registry.access.redhat.com/advanced-cluster-security/rhacs-scanner-db-rhel8"
+"advanced-cluster-security/rhacs-scanner-rhel8" = "registry.access.redhat.com/advanced-cluster-security/rhacs-scanner-rhel8"
+"aerospike/aerospike-kubernetes-operator" = "registry.connect.redhat.com/aerospike/aerospike-kubernetes-operator"
 "aerospike/aerospike-server-enterprise-ubi8" = "registry.connect.redhat.com/aerospike/aerospike-server-enterprise-ubi8"
 "agile-lab/wasp-consumers-batch" = "registry.connect.redhat.com/agile-lab/wasp-consumers-batch"
 "agile-lab/wasp-consumers-streaming" = "registry.connect.redhat.com/agile-lab/wasp-consumers-streaming"
@@ -55,10 +62,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-rhel8" = "registry.redhat.io/amq7/amq-streams-kafka-27-rhel8"
 "amq7/amq-streams-kafka-28-rhel8" = "registry.redhat.io/amq7/amq-streams-kafka-28-rhel8"
 "amq7/amq-streams-kafka-30-rhel8" = "registry.redhat.io/amq7/amq-streams-kafka-30-rhel8"
 "amq7/amq-streams-operator-bundle" = "registry.redhat.io/amq7/amq-streams-operator-bundle"
@@ -246,7 +254,7 @@
 "cambridgesemantics/anzo" = "registry.connect.redhat.com/cambridgesemantics/anzo"
 "cambridgesemantics/anzo-unstructured-operator-bundle" = "registry.connect.redhat.com/cambridgesemantics/anzo-unstructured-operator-bundle"
 "cambridgesemantics/anzo-unstructured-worker" = "registry.connect.redhat.com/cambridgesemantics/anzo-unstructured-worker"
-"cambridgesemantics/unstructured-operator" = "registry.redhat.io/cambridgesemantics/unstructured-operator"
+"cambridgesemantics/unstructured-operator" = "registry.connect.redhat.com/cambridgesemantics/unstructured-operator"
 "can-avanseus/can-app" = "registry.connect.redhat.com/can-avanseus/can-app"
 "can-avanseus/canapp" = "registry.connect.redhat.com/can-avanseus/canapp"
 "can-avanseus/can-operator" = "registry.connect.redhat.com/can-avanseus/can-operator"
@@ -260,6 +268,7 @@
 "can-avanseus/vbi" = "registry.connect.redhat.com/can-avanseus/vbi"
 "captivateioltd/rabbitmq" = "registry.connect.redhat.com/captivateioltd/rabbitmq"
 "carbonetes/operator-bundle" = "registry.connect.redhat.com/carbonetes/operator-bundle"
+"carbonetes/operator" = "registry.redhat.io/carbonetes/operator"
 "catalogicsoftware/cloudcasa-amds-kagent" = "registry.connect.redhat.com/catalogicsoftware/cloudcasa-amds-kagent"
 "catalogicsoftware/cloudcasa-bundle" = "registry.connect.redhat.com/catalogicsoftware/cloudcasa-bundle"
 "catalogicsoftware/cloudcasa-operator" = "registry.connect.redhat.com/catalogicsoftware/cloudcasa-operator"
@@ -499,6 +508,7 @@
 "datastax/cass-operator-bundle" = "registry.connect.redhat.com/datastax/cass-operator-bundle"
 "datastax/cass-operator" = "registry.connect.redhat.com/datastax/cass-operator"
 "datastax/dse-server" = "registry.connect.redhat.com/datastax/dse-server"
+"datastax/system-logger" = "registry.redhat.io/datastax/system-logger"
 "datera/rhosp13-openstack-cinder-volume-datera" = "registry.redhat.io/datera/rhosp13-openstack-cinder-volume-datera"
 "datera/rhosp16-openstack-cinder-volume-datera" = "registry.redhat.io/datera/rhosp16-openstack-cinder-volume-datera"
 "dell-emc/dell-csiop-bundle-110" = "registry.connect.redhat.com/dell-emc/dell-csiop-bundle-110"
@@ -541,6 +551,7 @@
 "dynatrace/dynatrace-operator-bundle" = "registry.redhat.io/dynatrace/dynatrace-operator-bundle"
 "dynatrace/dynatrace-operator" = "registry.connect.redhat.com/dynatrace/dynatrace-operator"
 "dynatrace/oneagent" = "registry.connect.redhat.com/dynatrace/oneagent"
+"e2e-container/e2e-cve-rebuilds-app" = "registry.redhat.io/e2e-container/e2e-cve-rebuilds-app"
 "e2e-container/workflow-test" = "registry.access.redhat.com/e2e-container/workflow-test"
 "eamli/eamli-operator-bundle" = "registry.connect.redhat.com/eamli/eamli-operator-bundle"
 "edb/edb-operator" = "quay.io/edb/edb-operator"
@@ -571,6 +582,7 @@
 "eres/v70" = "registry.connect.redhat.com/eres/v70"
 "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"
 "f5networks/f5-ipam-controller-operator" = "registry.connect.redhat.com/f5networks/f5-ipam-controller-operator"
 "f5networks/f5-ipam-controller" = "registry.redhat.io/f5networks/f5-ipam-controller"
 "f5networks/k8s-bigip-ctlr-operator-bundle" = "registry.connect.redhat.com/f5networks/k8s-bigip-ctlr-operator-bundle"
@@ -580,9 +592,13 @@
 "findability-sciences/fp-predict-plus-operator-bundle" = "registry.connect.redhat.com/findability-sciences/fp-predict-plus-operator-bundle"
 "findability-sciences/fp-predict-plus-operator" = "registry.connect.redhat.com/findability-sciences/fp-predict-plus-operator"
 "findability-sciences/fp-predict-plus" = "registry.redhat.io/findability-sciences/fp-predict-plus"
+"fiware/orion-ld" = "quay.io/fiware/orion-ld"
+"fortanix/ccm-node-agent-dcap-operator-bundle" = "registry.redhat.io/fortanix/ccm-node-agent-dcap-operator-bundle"
+"fortanix/ccm-node-agent-dcap-operator" = "registry.connect.redhat.com/fortanix/ccm-node-agent-dcap-operator"
 "fortanix/ccm-node-agent-operator-bundle" = "registry.connect.redhat.com/fortanix/ccm-node-agent-operator-bundle"
 "fortanix/ccm-node-agent-operator" = "registry.connect.redhat.com/fortanix/ccm-node-agent-operator"
 "fortanix/ccm-node-agent-ubi7" = "registry.connect.redhat.com/fortanix/ccm-node-agent-ubi7"
+"fortanix/multi-platform-registration-ubi8" = "registry.connect.redhat.com/fortanix/multi-platform-registration-ubi8"
 "fortanix/sgx-software-installer-ubi7" = "registry.connect.redhat.com/fortanix/sgx-software-installer-ubi7"
 "fujitsu/fujitsu-cinder-volume161" = "registry.redhat.io/fujitsu/fujitsu-cinder-volume161"
 "fujitsu/fujitsu-cinder-volume" = "registry.connect.redhat.com/fujitsu/fujitsu-cinder-volume"
@@ -592,6 +608,10 @@
 "fujitsu/fujitsu-enterprise-postgres-12-restore" = "registry.redhat.io/fujitsu/fujitsu-enterprise-postgres-12-restore"
 "fujitsu/fujitsu-enterprise-postgres-12-server" = "quay.io/fujitsu/fujitsu-enterprise-postgres-12-server"
 "fujitsu/fujitsu-enterprise-postgres-13-backup" = "quay.io/fujitsu/fujitsu-enterprise-postgres-13-backup"
+"fujitsu/fujitsu-enterprise-postgres-13-exporter" = "quay.io/fujitsu/fujitsu-enterprise-postgres-13-exporter"
+"fujitsu/fujitsu-enterprise-postgres-13-operator" = "quay.io/fujitsu/fujitsu-enterprise-postgres-13-operator"
+"fujitsu/fujitsu-enterprise-postgres-13-pgpool2" = "quay.io/fujitsu/fujitsu-enterprise-postgres-13-pgpool2"
+"fujitsu/fujitsu-enterprise-postgres-13-restore" = "quay.io/fujitsu/fujitsu-enterprise-postgres-13-restore"
 "fujitsu/fujitsu-enterprise-postgres-13-server" = "quay.io/fujitsu/fujitsu-enterprise-postgres-13-server"
 "fujitsu-postgres/fujitsu-enterprise-postgres-13-bundle" = "registry.redhat.io/fujitsu-postgres/fujitsu-enterprise-postgres-13-bundle"
 "fujitsu-postgres/fujitsu-enterprise-postgres-bundle" = "registry.connect.redhat.com/fujitsu-postgres/fujitsu-enterprise-postgres-bundle"
@@ -639,7 +659,7 @@
 "gluufederation/oxpassport" = "registry.connect.redhat.com/gluufederation/oxpassport"
 "gluufederation/oxshibboleth" = "registry.connect.redhat.com/gluufederation/oxshibboleth"
 "gluufederation/oxtrust" = "registry.connect.redhat.com/gluufederation/oxtrust"
-"gtsoftware/ivory-server" = "registry.connect.redhat.com/gtsoftware/ivory-server"
+"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"
@@ -664,6 +684,7 @@
 "hazelcast/management-center-3-rhel7" = "registry.connect.redhat.com/hazelcast/management-center-3-rhel7"
 "hazelcast/management-center-4-rhel8" = "registry.connect.redhat.com/hazelcast/management-center-4-rhel8"
 "hazelcast/management-center-5-rhel8" = "registry.connect.redhat.com/hazelcast/management-center-5-rhel8"
+"headspin/headspin-operator-bundle" = "registry.connect.redhat.com/headspin/headspin-operator-bundle"
 "headspin/headspin-operator" = "registry.connect.redhat.com/headspin/headspin-operator"
 "headspin/hspusher" = "registry.connect.redhat.com/headspin/hspusher"
 "hedvig/proxy" = "registry.connect.redhat.com/hedvig/proxy"
@@ -758,6 +779,7 @@
 "ibm/iao-util" = "registry.connect.redhat.com/ibm/iao-util"
 "ibm/ibm-acecc-configurator-dev" = "registry.connect.redhat.com/ibm/ibm-acecc-configurator-dev"
 "ibm/ibm-acecc-configurator-prod" = "registry.connect.redhat.com/ibm/ibm-acecc-configurator-prod"
+"ibm/ibm-application-gateway-operator-bundle" = "registry.connect.redhat.com/ibm/ibm-application-gateway-operator-bundle"
 "ibm/ibm-block-csi-operator-bundle" = "registry.connect.redhat.com/ibm/ibm-block-csi-operator-bundle"
 "ibm/ibm-block-csi-operator" = "registry.redhat.io/ibm/ibm-block-csi-operator"
 "ibm/ibm-cex-device-plugin-cm" = "registry.redhat.io/ibm/ibm-cex-device-plugin-cm"
@@ -783,8 +805,6 @@
 "ibm/ibm-spectrum-scale-csi-operator-bundle" = "registry.connect.redhat.com/ibm/ibm-spectrum-scale-csi-operator-bundle"
 "ibm/ibm-spectrum-scale-csi-operator" = "registry.connect.redhat.com/ibm/ibm-spectrum-scale-csi-operator"
 "ibm/ibm-storage-odf-operator-bundle" = "registry.connect.redhat.com/ibm/ibm-storage-odf-operator-bundle"
-"ibm/ibm-tas-bundle" = "registry.connect.redhat.com/ibm/ibm-tas-bundle"
-"ibm/ibmtririgaoperatorbundlelatest" = "registry.connect.redhat.com/ibm/ibmtririgaoperatorbundlelatest"
 "ibm/influxdb" = "registry.redhat.io/ibm/influxdb"
 "ibm/memcached-ppc64le" = "registry.redhat.io/ibm/memcached-ppc64le"
 "ibm/model-builder-augmentor" = "registry.connect.redhat.com/ibm/model-builder-augmentor"
@@ -792,6 +812,7 @@
 "ibm/model-builder-auth-service" = "registry.connect.redhat.com/ibm/model-builder-auth-service"
 "ibm/modelbuilder-auth-service" = "registry.connect.redhat.com/ibm/modelbuilder-auth-service"
 "ibm/modelbuilder-bundle" = "registry.connect.redhat.com/ibm/modelbuilder-bundle"
+"ibm/modelbuilder-bundle-rhm" = "registry.redhat.io/ibm/modelbuilder-bundle-rhm"
 "ibm/model-builder-cv-training-service" = "registry.connect.redhat.com/ibm/model-builder-cv-training-service"
 "ibm/modelbuilder-cv-training-service" = "registry.connect.redhat.com/ibm/modelbuilder-cv-training-service"
 "ibm/model-builder-image-server" = "registry.connect.redhat.com/ibm/model-builder-image-server"
@@ -836,6 +857,7 @@
 "infoblox/rhosp13-infoblox-ipam-agent" = "registry.redhat.io/infoblox/rhosp13-infoblox-ipam-agent"
 "instana/agent" = "registry.connect.redhat.com/instana/agent"
 "instana/instana-agent-operator-bundle" = "registry.connect.redhat.com/instana/instana-agent-operator-bundle"
+"instana/instana-agent-operator" = "registry.connect.redhat.com/instana/instana-agent-operator"
 "instana/instana-agent-operator-rhmp" = "registry.redhat.io/instana/instana-agent-operator-rhmp"
 "integration/camel-k-rhel8-operator-bundle" = "registry.redhat.io/integration/camel-k-rhel8-operator-bundle"
 "integration/camel-k-rhel8-operator" = "registry.redhat.io/integration/camel-k-rhel8-operator"
@@ -879,12 +901,6 @@
 "jboss-datavirt-6/datavirt64-driver-openshift" = "registry.access.redhat.com/jboss-datavirt-6/datavirt64-driver-openshift"
 "jboss-datavirt-6/datavirt64-openshift" = "registry.access.redhat.com/jboss-datavirt-6/datavirt64-openshift"
 "jboss-eap-7/eap72-openj9-11-openshift-rhel8" = "registry.redhat.io/jboss-eap-7/eap72-openj9-11-openshift-rhel8"
-"jboss-eap-7/eap73-openj9-11-openshift-rhel8" = "registry.redhat.io/jboss-eap-7/eap73-openj9-11-openshift-rhel8"
-"jboss-eap-7/eap73-openj9-11-runtime-openshift-rhel8" = "registry.redhat.io/jboss-eap-7/eap73-openj9-11-runtime-openshift-rhel8"
-"jboss-eap-7/eap73-openjdk11-openshift-rhel8" = "registry.redhat.io/jboss-eap-7/eap73-openjdk11-openshift-rhel8"
-"jboss-eap-7/eap73-openjdk11-runtime-openshift-rhel8" = "registry.redhat.io/jboss-eap-7/eap73-openjdk11-runtime-openshift-rhel8"
-"jboss-eap-7/eap73-openjdk8-openshift-rhel7" = "registry.redhat.io/jboss-eap-7/eap73-openjdk8-openshift-rhel7"
-"jboss-eap-7/eap73-openjdk8-runtime-openshift-rhel7" = "registry.redhat.io/jboss-eap-7/eap73-openjdk8-runtime-openshift-rhel7"
 "jboss-eap-7/eap73-rhel8-operator-bundle" = "registry.redhat.io/jboss-eap-7/eap73-rhel8-operator-bundle"
 "jboss-eap-7/eap73-rhel8-operator" = "registry.redhat.io/jboss-eap-7/eap73-rhel8-operator"
 "jboss-eap-7/eap74-openj9-11-openshift-rhel8" = "registry.redhat.io/jboss-eap-7/eap74-openj9-11-openshift-rhel8"
@@ -893,12 +909,6 @@
 "jboss-eap-7/eap74-openjdk11-runtime-openshift-rhel8" = "registry.redhat.io/jboss-eap-7/eap74-openjdk11-runtime-openshift-rhel8"
 "jboss-eap-7/eap74-openjdk8-openshift-rhel7" = "registry.redhat.io/jboss-eap-7/eap74-openjdk8-openshift-rhel7"
 "jboss-eap-7/eap74-openjdk8-runtime-openshift-rhel7" = "registry.redhat.io/jboss-eap-7/eap74-openjdk8-runtime-openshift-rhel7"
-"jboss-eap-7/eap-xp2-openj9-11-openshift-rhel8" = "registry.redhat.io/jboss-eap-7/eap-xp2-openj9-11-openshift-rhel8"
-"jboss-eap-7/eap-xp2-openj9-11-runtime-openshift-rhel8" = "registry.redhat.io/jboss-eap-7/eap-xp2-openj9-11-runtime-openshift-rhel8"
-"jboss-eap-7/eap-xp2-openjdk11-openshift-rhel8" = "registry.redhat.io/jboss-eap-7/eap-xp2-openjdk11-openshift-rhel8"
-"jboss-eap-7/eap-xp2-openjdk11-runtime-openshift-rhel8" = "registry.redhat.io/jboss-eap-7/eap-xp2-openjdk11-runtime-openshift-rhel8"
-"jboss-eap-7/eap-xp2-openjdk8-openshift-rhel7" = "registry.redhat.io/jboss-eap-7/eap-xp2-openjdk8-openshift-rhel7"
-"jboss-eap-7/eap-xp2-openjdk8-runtime-openshift-rhel7" = "registry.redhat.io/jboss-eap-7/eap-xp2-openjdk8-runtime-openshift-rhel7"
 "jboss-eap-7/eap-xp3-openj9-11-openshift-rhel8" = "registry.redhat.io/jboss-eap-7/eap-xp3-openj9-11-openshift-rhel8"
 "jboss-eap-7/eap-xp3-openj9-11-runtime-openshift-rhel8" = "registry.redhat.io/jboss-eap-7/eap-xp3-openj9-11-runtime-openshift-rhel8"
 "jboss-eap-7/eap-xp3-openjdk11-openshift-rhel8" = "registry.redhat.io/jboss-eap-7/eap-xp3-openjdk11-openshift-rhel8"
@@ -934,7 +944,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.redhat.io/jfrog/xray-operator"
+"jfrog/xray-operator" = "registry.connect.redhat.com/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"
@@ -944,6 +954,7 @@
 "joget/joget-dx-operator-bundle" = "registry.connect.redhat.com/joget/joget-dx-operator-bundle"
 "joget/joget-dx-operator-bundle-rhmp" = "registry.connect.redhat.com/joget/joget-dx-operator-bundle-rhmp"
 "joget/joget-dx-operator" = "registry.redhat.io/joget/joget-dx-operator"
+"kasten/admin" = "registry.connect.redhat.com/kasten/admin"
 "kasten/aggregatedapis" = "registry.connect.redhat.com/kasten/aggregatedapis"
 "kasten/ambassador" = "registry.connect.redhat.com/kasten/ambassador"
 "kasten/auth" = "registry.connect.redhat.com/kasten/auth"
@@ -956,15 +967,19 @@
 "kasten/dashboardbff" = "registry.connect.redhat.com/kasten/dashboardbff"
 "kasten/datamover" = "registry.connect.redhat.com/kasten/datamover"
 "kasten/dex" = "registry.connect.redhat.com/kasten/dex"
+"kasten/events" = "registry.redhat.io/kasten/events"
 "kasten/executor" = "registry.connect.redhat.com/kasten/executor"
 "kasten/frontend" = "registry.redhat.io/kasten/frontend"
 "kasten/grafana" = "registry.connect.redhat.com/kasten/grafana"
 "kasten/jobs" = "registry.connect.redhat.com/kasten/jobs"
+"kasten/k10-operator-paygo" = "registry.connect.redhat.com/kasten/k10-operator-paygo"
 "kasten/k10-operator" = "registry.connect.redhat.com/kasten/k10-operator"
 "kasten/kanister" = "registry.connect.redhat.com/kasten/kanister"
 "kasten/kanister-tools" = "registry.connect.redhat.com/kasten/kanister-tools"
 "kasten/kasten-bundle" = "registry.connect.redhat.com/kasten/kasten-bundle"
+"kasten/kasten-paygo-rhmp-bundle" = "registry.connect.redhat.com/kasten/kasten-paygo-rhmp-bundle"
 "kasten/kasten-rhmp-bundle" = "registry.connect.redhat.com/kasten/kasten-rhmp-bundle"
+"kasten/kasten-term-rhmp-bundle" = "registry.connect.redhat.com/kasten/kasten-term-rhmp-bundle"
 "kasten/logging" = "registry.connect.redhat.com/kasten/logging"
 "kasten/metering" = "registry.redhat.io/kasten/metering"
 "kasten/prometheus" = "registry.redhat.io/kasten/prometheus"
@@ -1094,11 +1109,7 @@
 "nirmata/kyverno" = "registry.connect.redhat.com/nirmata/kyverno"
 "nodesource/nsolid-console-rhel7-latest" = "registry.redhat.io/nodesource/nsolid-console-rhel7-latest"
 "nodesource/nsolid-rhel7-latest" = "registry.connect.redhat.com/nodesource/nsolid-rhel7-latest"
-"noiro/aci-containers-controller" = "quay.io/noiro/aci-containers-controller"
-"noiro/aci-containers-host" = "quay.io/noiro/aci-containers-host"
-"noiro/aci-containers-operator" = "quay.io/noiro/aci-containers-operator"
-"noiro/cnideploy" = "quay.io/noiro/cnideploy"
-"noiro/gbp-server" = "quay.io/noiro/gbp-server"
+"noiro/acc-provision-operator" = "quay.io/noiro/acc-provision-operator"
 "noiro/openstack-ciscoaci-aim" = "registry.connect.redhat.com/noiro/openstack-ciscoaci-aim"
 "noiro/openstack-ciscoaci-lldp" = "registry.connect.redhat.com/noiro/openstack-ciscoaci-lldp"
 "noiro/openstack-ciscoaci-neutron-opflex" = "registry.redhat.io/noiro/openstack-ciscoaci-neutron-opflex"
@@ -1106,8 +1117,6 @@
 "noiro/openstack-heat-engine-ciscoaci" = "registry.connect.redhat.com/noiro/openstack-heat-engine-ciscoaci"
 "noiro/openstack-horizon-ciscoaci" = "registry.connect.redhat.com/noiro/openstack-horizon-ciscoaci"
 "noiro/openstack-neutron-server-ciscoaci" = "registry.connect.redhat.com/noiro/openstack-neutron-server-ciscoaci"
-"noiro/openvswitch" = "quay.io/noiro/openvswitch"
-"noiro/opflex" = "quay.io/noiro/opflex"
 "nuagenetworks/rhosp13-openstack-heat-api-5-4-1-u16" = "registry.connect.redhat.com/nuagenetworks/rhosp13-openstack-heat-api-5-4-1-u16"
 "nuagenetworks/rhosp13-openstack-heat-api-5-4-1-u17" = "registry.connect.redhat.com/nuagenetworks/rhosp13-openstack-heat-api-5-4-1-u17"
 "nuagenetworks/rhosp13-openstack-heat-api-5-4-1-u3" = "registry.connect.redhat.com/nuagenetworks/rhosp13-openstack-heat-api-5-4-1-u3"
@@ -1250,7 +1259,18 @@
 "nutanix/nutanix-csi-operator" = "registry.connect.redhat.com/nutanix/nutanix-csi-operator"
 "nuxeo/nuxeo" = "registry.connect.redhat.com/nuxeo/nuxeo"
 "nvidia/gpu-operator-bundle" = "registry.connect.redhat.com/nvidia/gpu-operator-bundle"
+"oadp/oadp-kubevirt-velero-plugin-rhel8" = "registry.access.redhat.com/oadp/oadp-kubevirt-velero-plugin-rhel8"
+"oadp/oadp-mustgather-rhel8" = "registry.redhat.io/oadp/oadp-mustgather-rhel8"
+"oadp/oadp-operator-bundle" = "registry.access.redhat.com/oadp/oadp-operator-bundle"
+"oadp/oadp-registry-rhel8" = "registry.access.redhat.com/oadp/oadp-registry-rhel8"
 "oadp/oadp-rhel8-operator" = "registry.redhat.io/oadp/oadp-rhel8-operator"
+"oadp/oadp-velero-plugin-for-aws-rhel8" = "registry.access.redhat.com/oadp/oadp-velero-plugin-for-aws-rhel8"
+"oadp/oadp-velero-plugin-for-csi-rhel8" = "registry.access.redhat.com/oadp/oadp-velero-plugin-for-csi-rhel8"
+"oadp/oadp-velero-plugin-for-gcp-rhel8" = "registry.access.redhat.com/oadp/oadp-velero-plugin-for-gcp-rhel8"
+"oadp/oadp-velero-plugin-for-microsoft-azure-rhel8" = "registry.access.redhat.com/oadp/oadp-velero-plugin-for-microsoft-azure-rhel8"
+"oadp/oadp-velero-plugin-rhel8" = "registry.access.redhat.com/oadp/oadp-velero-plugin-rhel8"
+"oadp/oadp-velero-restic-restore-helper-rhel8" = "registry.access.redhat.com/oadp/oadp-velero-restic-restore-helper-rhel8"
+"oadp/oadp-velero-rhel8" = "registry.access.redhat.com/oadp/oadp-velero-rhel8"
 "ocp-tools-4/odo-init-container-rhel8" = "registry.access.redhat.com/ocp-tools-4/odo-init-container-rhel8"
 "ocs4/cephcsi-rhel8" = "registry.redhat.io/ocs4/cephcsi-rhel8"
 "ocs4/mcg-core-rhel8" = "registry.redhat.io/ocs4/mcg-core-rhel8"
@@ -1639,7 +1659,6 @@
 "openshift4/ose-helm-operator" = "registry.redhat.io/openshift4/ose-helm-operator"
 "openshift4/ose-hyperkube" = "registry.redhat.io/openshift4/ose-hyperkube"
 "openshift4/ose-ibm-cloud-controller-manager-rhel8" = "registry.redhat.io/openshift4/ose-ibm-cloud-controller-manager-rhel8"
-"openshift4/ose-ibm-vpc-block-csi-driver-rhel8" = "registry.redhat.io/openshift4/ose-ibm-vpc-block-csi-driver-rhel8"
 "openshift4/ose-insights-rhel8-operator" = "registry.redhat.io/openshift4/ose-insights-rhel8-operator"
 "openshift4/ose-installer-artifacts" = "registry.redhat.io/openshift4/ose-installer-artifacts"
 "openshift4/ose-installer" = "registry.redhat.io/openshift4/ose-installer"
@@ -1755,6 +1774,7 @@
 "openshift-logging/logging-curator5-rhel8" = "registry.redhat.io/openshift-logging/logging-curator5-rhel8"
 "openshift/metallb-rhel9" = "registry.redhat.io/openshift/metallb-rhel9"
 "openshift-metering/ose-metering-hadoop-rhel8" = "registry.redhat.io/openshift-metering/ose-metering-hadoop-rhel8"
+"openshift/mirror-registry-rhel8" = "registry.redhat.io/openshift/mirror-registry-rhel8"
 "openshift-pipelines/pipelines-cli-tkn-rhel8" = "registry.redhat.io/openshift-pipelines/pipelines-cli-tkn-rhel8"
 "openshift-pipelines/pipelines-controller-rhel8" = "registry.redhat.io/openshift-pipelines/pipelines-controller-rhel8"
 "openshift-pipelines/pipelines-entrypoint-rhel8" = "registry.redhat.io/openshift-pipelines/pipelines-entrypoint-rhel8"
@@ -1779,6 +1799,7 @@
 "openshift-serverless-1/eventing-controller-rhel8" = "registry.redhat.io/openshift-serverless-1/eventing-controller-rhel8"
 "openshift-serverless-1/eventing-in-memory-channel-controller-rhel8" = "registry.redhat.io/openshift-serverless-1/eventing-in-memory-channel-controller-rhel8"
 "openshift-serverless-1/eventing-in-memory-channel-dispatcher-rhel8" = "registry.redhat.io/openshift-serverless-1/eventing-in-memory-channel-dispatcher-rhel8"
+"openshift-serverless-1/eventing-kafka-channel-cleanup-rhel8" = "registry.redhat.io/openshift-serverless-1/eventing-kafka-channel-cleanup-rhel8"
 "openshift-serverless-1/eventing-kafka-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"
@@ -1883,6 +1904,7 @@
 "percona/percona-postgresql-operator-containers" = "registry.redhat.io/percona/percona-postgresql-operator-containers"
 "percona/percona-postgresql-operator" = "registry.redhat.io/percona/percona-postgresql-operator"
 "percona/percona-server-mongodb-operator-bundle" = "registry.redhat.io/percona/percona-server-mongodb-operator-bundle"
+"percona/percona-server-mongodb-operator-bundle-rhmp" = "registry.connect.redhat.com/percona/percona-server-mongodb-operator-bundle-rhmp"
 "percona/percona-xtradb-cluster-operator-bundle-rhmp" = "registry.connect.redhat.com/percona/percona-xtradb-cluster-operator-bundle-rhmp"
 "percona/percona-xtradb-cluster-operator" = "registry.connect.redhat.com/percona/percona-xtradb-cluster-operator"
 "pingcap/tidb-2point1" = "registry.redhat.io/pingcap/tidb-2point1"
@@ -1937,7 +1959,7 @@
 "purestorage/openstack-cinder-volume-pure-rhosp-15" = "registry.connect.redhat.com/purestorage/openstack-cinder-volume-pure-rhosp-15"
 "purestorage/openstack-cinder-volume-pure-rhosp-16-1" = "registry.connect.redhat.com/purestorage/openstack-cinder-volume-pure-rhosp-16-1"
 "purestorage/openstack-cinder-volume-pure-rhosp-16-2" = "registry.connect.redhat.com/purestorage/openstack-cinder-volume-pure-rhosp-16-2"
-"purestorage/openstack-cinder-volume-pure-rhosp-16" = "registry.redhat.io/purestorage/openstack-cinder-volume-pure-rhosp-16"
+"purestorage/openstack-cinder-volume-pure-rhosp-16" = "registry.connect.redhat.com/purestorage/openstack-cinder-volume-pure-rhosp-16"
 "quarkus/mandrel-21-rhel8" = "registry.redhat.io/quarkus/mandrel-21-rhel8"
 "quay/clair-rhel8" = "registry.redhat.io/quay/clair-rhel8"
 "quay/quay-bridge-operator-bundle" = "registry.redhat.io/quay/quay-bridge-operator-bundle"
@@ -1954,19 +1976,14 @@
 "r-5fb43bf5b46414d7de2ad0c6" = "registry.redhat.io/r-5fb43bf5b46414d7de2ad0c6"
 "r-6026254a10da100e68ccee28" = "quay.io/r-6026254a10da100e68ccee28"
 "r-602625a710da100e68ccee29" = "quay.io/r-602625a710da100e68ccee29"
-"r-604ea2c16280a414853ece84" = "quay.io/r-604ea2c16280a414853ece84"
-"r-6132308774d3177984523143" = "quay.io/r-6132308774d3177984523143"
-"r-6133aaa1c3f77db73efe743f" = "quay.io/r-6133aaa1c3f77db73efe743f"
-"r-6133ad25c3f77db73efe7441" = "quay.io/r-6133ad25c3f77db73efe7441"
-"r-6133aff2c3f77db73efe7442" = "quay.io/r-6133aff2c3f77db73efe7442"
-"r-6133b2caa6121c27b6b88fbe" = "quay.io/r-6133b2caa6121c27b6b88fbe"
-"r-613f8666333748670463a91b" = "quay.io/r-613f8666333748670463a91b"
 "r-615b92a3f14158265cab81cf" = "quay.io/r-615b92a3f14158265cab81cf"
 "r-615d2cab466de66fed5066b9" = "quay.io/r-615d2cab466de66fed5066b9"
 "r-615d2ce5e2608a5d485d96db" = "quay.io/r-615d2ce5e2608a5d485d96db"
 "r-619bf9a472fcd1d92913ea38" = "quay.io/r-619bf9a472fcd1d92913ea38"
 "r-61dd6d33377742def7df0cba" = "quay.io/r-61dd6d33377742def7df0cba"
-"realmethods/realmethods12" = "registry.connect.redhat.com/realmethods/realmethods12"
+"r-61deecd49593409b3d9e2f56" = "quay.io/r-61deecd49593409b3d9e2f56"
+"r-61ef991a21dd58e81728e2de" = "quay.io/r-61ef991a21dd58e81728e2de"
+"realmethods/realmethods12" = "registry.redhat.io/realmethods/realmethods12"
 "realmethods/realmethods-operator-12" = "registry.connect.redhat.com/realmethods/realmethods-operator-12"
 "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"
@@ -2167,7 +2184,6 @@
 "rhel8/s2i-base" = "registry.redhat.io/rhel8/s2i-base"
 "rhel8/s2i-core" = "registry.redhat.io/rhel8/s2i-core"
 "rhel8/skopeo" = "registry.redhat.io/rhel8/skopeo"
-"rhel8/sssd" = "registry.redhat.io/rhel8/sssd"
 "rhel8/support-tools" = "registry.redhat.io/rhel8/support-tools"
 "rhel8/varnish-6" = "registry.redhat.io/rhel8/varnish-6"
 "rhel9-0-els/rhel" = "registry.redhat.io/rhel9-0-els/rhel"
@@ -2490,6 +2506,9 @@
 "rh-sso-7/sso74-openshift-rhel8" = "registry.redhat.io/rh-sso-7/sso74-openshift-rhel8"
 "rh-sso-7/sso75-openj9-openshift-rhel8" = "registry.redhat.io/rh-sso-7/sso75-openj9-openshift-rhel8"
 "rh-sso-7/sso75-openshift-rhel8" = "registry.redhat.io/rh-sso-7/sso75-openshift-rhel8"
+"rh-sso-7/sso7-rhel8-init-container" = "registry.redhat.io/rh-sso-7/sso7-rhel8-init-container"
+"rh-sso-7/sso7-rhel8-operator-bundle" = "registry.redhat.io/rh-sso-7/sso7-rhel8-operator-bundle"
+"rh-sso-7/sso7-rhel8-operator" = "registry.redhat.io/rh-sso-7/sso7-rhel8-operator"
 "robinio/robin-operator" = "registry.redhat.io/robinio/robin-operator"
 "robinio/robin-storage-enterprise" = "registry.connect.redhat.com/robinio/robin-storage-enterprise"
 "robinio/robin-storage-express" = "registry.connect.redhat.com/robinio/robin-storage-express"
@@ -2542,32 +2561,33 @@
 "signalfx-inc/smart-agent" = "registry.connect.redhat.com/signalfx-inc/smart-agent"
 "sixfusion/openshift-collector1" = "registry.connect.redhat.com/sixfusion/openshift-collector1"
 "slcorp/rtview-dataserver" = "registry.connect.redhat.com/slcorp/rtview-dataserver"
+"smilecdr/smilecdr" = "registry.connect.redhat.com/smilecdr/smilecdr"
 "snapt/snaptadc" = "registry.connect.redhat.com/snapt/snaptadc"
 "snyk/kubernetes-monitor" = "registry.redhat.io/snyk/kubernetes-monitor"
 "snyk/kubernetes-operator-bundle" = "registry.connect.redhat.com/snyk/kubernetes-operator-bundle"
 "snyk/kubernetes-operator" = "registry.connect.redhat.com/snyk/kubernetes-operator"
+"solace/pubsubplus-standard" = "registry.connect.redhat.com/solace/pubsubplus-standard"
 "sonatype/nexus-iq-server" = "registry.redhat.io/sonatype/nexus-iq-server"
 "sonatype/nexus-repository-manager" = "registry.connect.redhat.com/sonatype/nexus-repository-manager"
 "splunk/sck101" = "registry.connect.redhat.com/splunk/sck101"
-"sso-7/sso73-openj9-openshift-rhel7" = "registry.redhat.io/sso-7/sso73-openj9-openshift-rhel7"
 "stakater/tenant-operator" = "registry.connect.redhat.com/stakater/tenant-operator"
 "starburst/hive" = "registry.connect.redhat.com/starburst/hive"
 "starburst/presto-init" = "registry.connect.redhat.com/starburst/presto-init"
 "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" = "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/service-telemetry-operator-bundle" = "registry.redhat.io/stf/service-telemetry-operator-bundle"
-"stf/service-telemetry-rhel7-operator" = "registry.redhat.io/stf/service-telemetry-rhel7-operator"
+"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"
 "stf/sg-bridge-rhel8" = "registry.redhat.io/stf/sg-bridge-rhel8"
 "stf/sg-core-rhel8" = "registry.redhat.io/stf/sg-core-rhel8"
 "stf/smart-gateway-operator-bundle" = "registry.redhat.io/stf/smart-gateway-operator-bundle"
-"stf/smart-gateway-rhel7-operator" = "registry.redhat.io/stf/smart-gateway-rhel7-operator"
+"stf/smart-gateway-rhel7-operator-metadata" = "registry.redhat.io/stf/smart-gateway-rhel7-operator-metadata"
 "stf/smart-gateway-rhel8-operator" = "registry.redhat.io/stf/smart-gateway-rhel8-operator"
-"stf/smart-gateway-rhel8" = "registry.redhat.io/stf/smart-gateway-rhel8"
 "stonebranch/stonebranch-operator-bundle" = "registry.connect.redhat.com/stonebranch/stonebranch-operator-bundle"
 "stonebranch/stonebranch-operator" = "registry.connect.redhat.com/stonebranch/stonebranch-operator"
 "stonebranch/universalagent66" = "registry.redhat.io/stonebranch/universalagent66"
@@ -2595,6 +2615,7 @@
 "sumologic/sumologic-kubernetes-collection-helm-operator-bundle" = "registry.redhat.io/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"
 "thalescpl/lunaclient" = "registry.redhat.io/thalescpl/lunaclient"
 "thestormforge/optimize-controller-ubi8" = "registry.connect.redhat.com/thestormforge/optimize-controller-ubi8"
 "thestormforge/stormforge-optimize" = "registry.connect.redhat.com/thestormforge/stormforge-optimize"
@@ -2727,6 +2748,7 @@
 "turbonomic/mediation-xtremio" = "registry.connect.redhat.com/turbonomic/mediation-xtremio"
 "turbonomic/nginx" = "registry.connect.redhat.com/turbonomic/nginx"
 "turbonomic/plan-orchestrator" = "registry.connect.redhat.com/turbonomic/plan-orchestrator"
+"turbonomic/prometurbo-operator" = "registry.connect.redhat.com/turbonomic/prometurbo-operator"
 "turbonomic/prometurbo" = "registry.redhat.io/turbonomic/prometurbo"
 "turbonomic/repository" = "registry.connect.redhat.com/turbonomic/repository"
 "turbonomic/rsyslog" = "registry.connect.redhat.com/turbonomic/rsyslog"
diff --git a/SOURCES/containers.conf b/SOURCES/containers.conf
index 5961d59..50ef1b7 100644
--- a/SOURCES/containers.conf
+++ b/SOURCES/containers.conf
@@ -405,7 +405,6 @@ default_sysctls = [
 # specify an image to pull.
 #
 #infra_image = ""
-infra_image = "registry.access.redhat.com/ubi8/pause"
 
 # Specify the locking mechanism to use; valid values are "shm" and "file".
 # Change the default only if you are sure of what you are doing, in general
diff --git a/SOURCES/update.sh b/SOURCES/update.sh
index 36d027f..6a57556 100755
--- a/SOURCES/update.sh
+++ b/SOURCES/update.sh
@@ -27,7 +27,6 @@ if pwd | grep rhel-8 > /dev/null
 then
 ensure registries.conf unqualified-search-registries [\"registry.fedoraproject.org\",\ \"registry.access.redhat.com\",\ \"registry.centos.org\",\ \"docker.io\"]
 ensure registries.conf short-name-mode               \"permissive\"
-ensure containers.conf infra_image                   \"registry.access.redhat.com/ubi8/pause\"
 ensure containers.conf runtime                       \"runc\"
 ensure containers.conf events_logger                 \"file\"
 ensure containers.conf log_driver                    \"k8s-file\"
@@ -35,7 +34,6 @@ ensure containers.conf network_backend               \"cni\"
 else
 ensure registries.conf unqualified-search-registries [\"registry.fedoraproject.org\",\ \"registry.access.redhat.com\",\ \"registry.centos.org\",\ \"quay.io\",\ \"docker.io\"]
 ensure registries.conf short-name-mode               \"enforcing\"
-ensure containers.conf infra_image                   \"registry.access.redhat.com/ubi8/pause\"
 ensure containers.conf runtime                       \"crun\"
 fi
 [ `grep "keyctl" seccomp.json | wc -l` == 0 ] && sed -i '/\"kill\",/i \
diff --git a/SPECS/containers-common.spec b/SPECS/containers-common.spec
index ed29e3c..958d703 100644
--- a/SPECS/containers-common.spec
+++ b/SPECS/containers-common.spec
@@ -4,20 +4,21 @@
 # pick the oldest version on c/image, c/common, c/storage vendored in
 # podman/skopeo/podman.
 %global skopeo_branch main
-%global image_branch v5.19.0
-%global common_branch v0.47.2
+%global image_branch v5.19.1
+%global common_branch v0.47.4
 %global storage_branch v1.38.2
 %global shortnames_branch main
 
 Epoch: 2
 Name: containers-common
 Version: 1
-Release: 21%{?dist}
+Release: 33%{?dist}
 Summary: Common configuration and documentation for containers
 License: ASL 2.0
-BuildArch: noarch
-BuildRequires: go-md2man
+BuildRequires: /usr/bin/go-md2man
 Provides: skopeo-containers = %{epoch}:%{version}-%{release}
+Conflicts: %{name} <= 2:1-22
+Obsoletes: %{name} <= 2:1-22
 Requires: (container-selinux >= 2:2.162.1 if selinux-policy)
 Requires: oci-runtime
 %if 0%{?rhel} >= 9 || 0%{?fedora}
@@ -60,6 +61,28 @@ Source100: update.sh
 Source101: update-vendored.sh
 Source102: pyxis.sh
 
+%global aardvark_dns_version v1.0.1
+%global aardvark_dns_branch v1.0.1-rhel
+%global aardvark_dns_commit0 0a8eabf6f696f4f1ab14e5722578829362304e0b
+%global aardvark_dns_shortcommit0 %(c=%{aardvark_dns_commit0}; echo ${c:0:7})
+%if 0%{?aardvark_dns_branch:1}
+Source200: https://github.com/containers/aardvark-dns/tarball/%{aardvark_dns_commit0}/%{aardvark_dns_branch}-%{aardvark_dns_shortcommit0}.tar.gz
+%else
+Source200: https://github.com/containers/aardvark-dns/archive/%{aardvark_dns_commit0}/aardvark-dns-%{aardvark_dns_version}-%{aardvark_dns_shortcommit0}.tar.gz
+%endif
+Source201: https://github.com/containers/aardvark-dns/releases/download/%{aardvark_dns_version}/aardvark-dns-%{aardvark_dns_version}-vendor.tar.gz
+
+%global netavark_version v1.0.1
+%global netavark_branch v1.0.1-rhel
+%global netavark_commit0 93af39418a38c9cc901816240c3e7ccb715108c0
+%global netavark_shortcommit0 %(c=%{netavark_commit0}; echo ${c:0:7})
+%if 0%{?netavark_branch:1}
+Source300: https://github.com/containers/netavark/tarball/%{netavark_commit0}/%{netavark_branch}-%{netavark_shortcommit0}.tar.gz
+%else
+Source300: https://github.com/containers/netavark/archive/%{netavark_commit0}/netavark-%{netavark_version}-%{netavark_shortcommit0}.tar.gz
+%endif
+Source301: https://github.com/containers/netavark/releases/download/%{netavark_version}/netavark-%{netavark_version}-vendor.tar.gz
+
 %description
 This package contains common configuration files and documentation for container
 tools ecosystem, such as Podman, Buildah and Skopeo.
@@ -68,11 +91,141 @@ 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: 33%{?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: 33%{?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
@@ -159,7 +312,66 @@ EOF
 %dir %{_datadir}/rhel/secrets
 %{_datadir}/rhel/secrets/*
 
+%files -n aardvark-dns
+%dir %{_libexecdir}/podman
+%{_libexecdir}/podman/aardvark-dns
+
+%files -n netavark
+%dir %{_libexecdir}/podman
+%{_libexecdir}/podman/netavark
+%{_mandir}/man1/netavark.1*
+
 %changelog
+* Mon Mar 28 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-33
+- Removal of invalid vendored project with unwanted license in aardvark-dns/netavark
+- Resolves: #2065706
+
+* Mon Feb 28 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-32
+- build rust packages with RUSTFLAGS set to make ExecShield happy (Lokesh Mandvekar)
+- Related: #2000051
+
+* Mon Feb 28 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-31
+- update to netavark and aardvark-dns 1.0.1
+- Related: #2000051
+
+* Wed Feb 23 2022 Lokesh Mandvekar <lsm5@redhat.com> - 2:1-30
+- archful package should conflict with older noarch package
+- Related: #2000051
+
+* Tue Feb 22 2022 Lokesh Mandvekar <lsm5@redhat.com> - 2:1-29
+- consistent release tags for all packages
+- Related: #2000051
+
+* Tue Feb 22 2022 Lokesh Mandvekar <lsm5@redhat.com> - 2:1-28
+- main package should obsolete noarch versions upto 2:1-22
+- Related: #2000051
+
+* Mon Feb 21 2022 Lokesh Mandvekar <lsm5@redhat.com> - 2:1-27
+- do not specify infra_image in containers.conf
+- needed to resolve gating test failures
+- Related: #2000051
+
+* Sat Feb 19 2022 Lokesh Mandvekar <lsm5@redhat.com> - 2:1-26
+- aardvark-dns built for same arches as netavark
+- Related: #2000051
+
+* Sat Feb 19 2022 Lokesh Mandvekar <lsm5@redhat.com> - 2:1-25
+- build netavark only for podman's arches
+- i686 can't find go-md2man which causes the build to fail otherwise
+- Related: #2000051
+
+* Fri Feb 18 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-24
+- update to netavark-1.0.0 and aardvark-dns-1.0.0
+- Related: #2000051
+
+* Thu Feb 17 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-23
+- package aarvark-dns and netavark as part of the containers-common
+- Related: #2000051
+
+* Thu Feb 17 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-22
+- update shortnames and vendored components
+- Related: #2000051
+
 * Wed Feb 16 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-21
 - containers.conf should contain network_backend = "cni" in RHEL8.6
 - Related: #2000051