diff --git a/001-rhel-shortnames-pyxis.conf b/001-rhel-shortnames-pyxis.conf
index a801af5..812cb3a 100644
--- a/001-rhel-shortnames-pyxis.conf
+++ b/001-rhel-shortnames-pyxis.conf
@@ -537,6 +537,8 @@
 "cloudark/kubeplus-operator-bundle" = "registry.connect.redhat.com/cloudark/kubeplus-operator-bundle"
 "cloudark/kubeplus-platform-operator" = "registry.connect.redhat.com/cloudark/kubeplus-platform-operator"
 "cloudark/kubeplus-webhook-cert-setup" = "registry.connect.redhat.com/cloudark/kubeplus-webhook-cert-setup"
+"cloud/container-runtime" = "cr.metax-tech.com/cloud/container-runtime"
+"cloud/driver-manager" = "cr.metax-tech.com/cloud/driver-manager"
 "cloudera/cfm-nifi-k8s" = "container.repository.cloudera.com/cloudera/cfm-nifi-k8s"
 "cloudera/cfm-nifiregistry-k8s" = "container.repository.cloudera.com/cloudera/cfm-nifiregistry-k8s"
 "cloudera/cfm-operator-bundle" = "registry.connect.redhat.com/cloudera/cfm-operator-bundle"
@@ -1761,7 +1763,6 @@
 "flomesh/pipy-repo-ubi8" = "quay.io/flomesh/pipy-repo-ubi8"
 "flomesh/pipy-ubi8" = "quay.io/flomesh/pipy-ubi8"
 "flomesh/toolbox-ubi8" = "quay.io/flomesh/toolbox-ubi8"
-"fluentdo/agent" = "registry.connect.redhat.com/fluentdo/agent"
 "flux/flux-operator" = "registry.connect.redhat.com/flux/flux-operator"
 "flux/helm-controller" = "registry.connect.redhat.com/flux/helm-controller"
 "flux/image-automation-controller" = "registry.connect.redhat.com/flux/image-automation-controller"
@@ -1893,7 +1894,6 @@
 "geosafe-ea-ubi/healthcheck" = "registry.intersec.com/geosafe-ea-ubi/healthcheck"
 "geosafe-ea-ubi/hub-connector" = "registry.intersec.com/geosafe-ea-ubi/hub-connector"
 "geosafe-ea-ubi/php-fpm" = "registry.intersec.com/geosafe-ea-ubi/php-fpm"
-"ghcr.io/appscode/taskqueue" = "ghcr.io/ghcr.io/appscode/taskqueue"
 "gigamoneng/gigamon-gigavue-uctc-cntlr" = "docker.io/gigamoneng/gigamon-gigavue-uctc-cntlr"
 "gigamoneng/gigamon-gigavue-uctc-tap" = "docker.io/gigamoneng/gigamon-gigavue-uctc-tap"
 "gigamon/gigamon-gigavue-uctc-cntlr" = "docker.io/gigamon/gigamon-gigavue-uctc-cntlr"
@@ -2741,6 +2741,7 @@
 "lightbits-operator/lb-nvme-discovery-client" = "docker.lightbitslabs.com/lightbits-operator/lb-nvme-discovery-client"
 "lightspeed-core/dataverse-exporter-rhel9" = "registry.redhat.io/lightspeed-core/dataverse-exporter-rhel9"
 "lightspeed-core/lightspeed-stack-rhel9" = "registry.redhat.io/lightspeed-core/lightspeed-stack-rhel9"
+"lightspeed-core/rag-tool-rhel9" = "registry.redhat.io/lightspeed-core/rag-tool-rhel9"
 "linbit/drbd-9" = "registry.connect.redhat.com/linbit/drbd-9"
 "linbit/linstor-controller" = "registry.connect.redhat.com/linbit/linstor-controller"
 "linbit/linstor-operator-bundle" = "registry.connect.redhat.com/linbit/linstor-operator-bundle"
@@ -5787,6 +5788,7 @@
 "rhtas/cosign-rhel9" = "registry.redhat.io/rhtas/cosign-rhel9"
 "rhtas/createtree-rhel9" = "registry.redhat.io/rhtas/createtree-rhel9"
 "rhtas/ec-rhel9" = "registry.redhat.io/rhtas/ec-rhel9"
+"rhtas/fetch-tsa-certs-rhel9" = "registry.redhat.io/rhtas/fetch-tsa-certs-rhel9"
 "rhtas/fulcio-rhel9" = "registry.redhat.io/rhtas/fulcio-rhel9"
 "rhtas/gitsign-rhel9" = "registry.redhat.io/rhtas/gitsign-rhel9"
 "rhtas/model-transparency-rhel9" = "registry.redhat.io/rhtas/model-transparency-rhel9"
@@ -6167,6 +6169,7 @@
 "sysdig/rh-shield-operator" = "quay.io/sysdig/rh-shield-operator"
 "sysdig/sysdig-shield-operator" = "registry.connect.redhat.com/sysdig/sysdig-shield-operator"
 "takebishi/devicegateway" = "registry.connect.redhat.com/takebishi/devicegateway"
+"telemetryforge/agent" = "registry.connect.redhat.com/telemetryforge/agent"
 "te-signaling/be" = "esc-docker-drop.artifactorypro.shared.pub.tds.tieto.com/te-signaling/be"
 "te-signaling/inst-state-query" = "esc-docker-drop.artifactorypro.shared.pub.tds.tieto.com/te-signaling/inst-state-query"
 "te-signaling/logd-convert" = "esc-docker-drop.artifactorypro.shared.pub.tds.tieto.com/te-signaling/logd-convert"
diff --git a/containers-common.spec b/containers-common.spec
index 28e86ab..da9f6d8 100644
--- a/containers-common.spec
+++ b/containers-common.spec
@@ -17,7 +17,7 @@
 Name: containers-common
 Epoch: 5
 Version: %{common_version}
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: Apache-2.0
 BuildArch: noarch
 # for BuildRequires: go-md2man
@@ -203,6 +203,10 @@ ln -s ../../../..%{_sysconfdir}/yum.repos.d/redhat.repo %{buildroot}%{_datadir}/
 %files extra
 
 %changelog
+* Thu Feb 05 2026 Jindrich Novy <jnovy@redhat.com> - 5:0.64.2-7
+- do not allow the shortname to contain registry
+- Resolves: RHEL-147179
+
 * Thu Feb 05 2026 Jindrich Novy <jnovy@redhat.com> - 5:0.64.2-6
 - update shortnames and vendored components for RHEL-10.2
 - Resolves: RHEL-146877
diff --git a/pyxis.sh b/pyxis.sh
index eb866cd..95cedc7 100755
--- a/pyxis.sh
+++ b/pyxis.sh
@@ -28,6 +28,7 @@ while [ $IDX -lt ${#lines[@]} ]; do
      [ "$REPOSITORY" != \"\" ] &&
      [[ $REPOSITORY != *[@:]* ]] &&
      [[ $REPOSITORY != *[* ]] &&
+     ! [[ ${REPOSITORY%%/*} == *.* ]] &&
      [[ $REGISTRY == *.* ]] &&
      [ "$REGISTRY" != "non_registry" ]; then
     if [[ $REGISTRY == *quay.io* ]] ||