diff --git a/build/pin-images.py b/build/pin-images.py
index 1bf4112d0..f7485da6c 100755
--- a/build/pin-images.py
+++ b/build/pin-images.py
@@ -65,10 +65,13 @@ def get_digest(image_ref, token=None):
 def get_pinned_image(image_src):
     image_ref = reference.Reference.parse(image_src)
 
-    if image_ref.domain() == "registry.atmosphere.dev":
+    if (
+        image_ref.domain() == "registry.atmosphere.dev"
+        or image_ref.domain() == "harbor.atmosphere.dev"
+    ):
         # Get token for docker.io
         r = requests.get(
-            "https://registry.atmosphere.dev/service/token",
+            "https://harbor.atmosphere.dev/service/token",
             timeout=5,
             params={
                 "service": "harbor-registry",
diff --git a/images/barbican/Dockerfile b/images/barbican/Dockerfile
index 675cf8f2b..f32e73c45 100644
--- a/images/barbican/Dockerfile
+++ b/images/barbican/Dockerfile
@@ -3,7 +3,7 @@
 
 ARG RELEASE
 
-FROM registry.atmosphere.dev/library/openstack-venv-builder:${RELEASE} AS build
+FROM harbor.atmosphere.dev/library/openstack-venv-builder:${RELEASE} AS build
 ARG BARBICAN_GIT_REF=7d6749fcb1ad16a3350de82cd8e523d5b55306f8
 ADD --keep-git-dir=true https://opendev.org/openstack/barbican.git#${BARBICAN_GIT_REF} /src/barbican
 RUN git -C /src/barbican fetch --unshallow
@@ -14,5 +14,5 @@ pip3 install \
         pykmip
 EOF
 
-FROM registry.atmosphere.dev/library/openstack-python-runtime:${RELEASE}
+FROM harbor.atmosphere.dev/library/openstack-python-runtime:${RELEASE}
 COPY --from=build --link /var/lib/openstack /var/lib/openstack
diff --git a/images/cinder/Dockerfile b/images/cinder/Dockerfile
index e28c8174b..b489a539f 100644
--- a/images/cinder/Dockerfile
+++ b/images/cinder/Dockerfile
@@ -3,7 +3,7 @@
 
 ARG RELEASE
 
-FROM registry.atmosphere.dev/library/openstack-venv-builder:${RELEASE} AS build
+FROM harbor.atmosphere.dev/library/openstack-venv-builder:${RELEASE} AS build
 ARG CINDER_GIT_REF=4aa6590a483901de64e0d162fff11f3d2d7f9977
 ADD --keep-git-dir=true https://opendev.org/openstack/cinder.git#${CINDER_GIT_REF} /src/cinder
 RUN git -C /src/cinder fetch --unshallow
@@ -25,7 +25,7 @@ ADD --chmod=644 \
     https://github.com/storpool/storpool-openstack-integration/raw/master/drivers/os_brick/openstack/zed/storpool.py \
     /var/lib/openstack/lib/python3.10/site-packages/os_brick/initiator/connectors/storpool.py
 
-FROM registry.atmosphere.dev/library/openstack-python-runtime:${RELEASE}
+FROM harbor.atmosphere.dev/library/openstack-python-runtime:${RELEASE}
 RUN <<EOF bash -xe
 apt-get update -qq
 apt-get install -qq -y --no-install-recommends \
diff --git a/images/designate/Dockerfile b/images/designate/Dockerfile
index 011ef50c7..9d3b13526 100644
--- a/images/designate/Dockerfile
+++ b/images/designate/Dockerfile
@@ -3,7 +3,7 @@
 
 ARG RELEASE
 
-FROM registry.atmosphere.dev/library/openstack-venv-builder:${RELEASE} AS build
+FROM harbor.atmosphere.dev/library/openstack-venv-builder:${RELEASE} AS build
 ARG DESIGNATE_GIT_REF=d247267823034c5e656f74e91b50475aa54d3fa6
 ADD --keep-git-dir=true https://opendev.org/openstack/designate.git#${DESIGNATE_GIT_REF} /src/designate
 RUN git -C /src/designate fetch --unshallow
@@ -13,7 +13,7 @@ pip3 install \
         /src/designate
 EOF
 
-FROM registry.atmosphere.dev/library/openstack-python-runtime:${RELEASE}
+FROM harbor.atmosphere.dev/library/openstack-python-runtime:${RELEASE}
 RUN <<EOF bash -xe
 apt-get update -qq
 apt-get install -qq -y --no-install-recommends \
diff --git a/images/glance/Dockerfile b/images/glance/Dockerfile
index 58b57f2fb..08d68c411 100644
--- a/images/glance/Dockerfile
+++ b/images/glance/Dockerfile
@@ -3,7 +3,7 @@
 
 ARG RELEASE
 
-FROM registry.atmosphere.dev/library/openstack-venv-builder:${RELEASE} AS build
+FROM harbor.atmosphere.dev/library/openstack-venv-builder:${RELEASE} AS build
 ARG GLANCE_GIT_REF=8bbe205c6497032790505579accb4cf1ff341599
 ADD --keep-git-dir=true https://opendev.org/openstack/glance.git#${GLANCE_GIT_REF} /src/glance
 RUN git -C /src/glance fetch --unshallow
@@ -23,7 +23,7 @@ ADD --chmod=644 \
     https://github.com/storpool/storpool-openstack-integration/raw/master/drivers/os_brick/openstack/zed/storpool.py \
     /var/lib/openstack/lib/python3.10/site-packages/os_brick/initiator/connectors/storpool.py
 
-FROM registry.atmosphere.dev/library/openstack-python-runtime:${RELEASE}
+FROM harbor.atmosphere.dev/library/openstack-python-runtime:${RELEASE}
 RUN <<EOF bash -xe
 apt-get update -qq
 apt-get install -qq -y --no-install-recommends \
diff --git a/images/heat/Dockerfile b/images/heat/Dockerfile
index 6675eb0c4..01e293b73 100644
--- a/images/heat/Dockerfile
+++ b/images/heat/Dockerfile
@@ -3,7 +3,7 @@
 
 ARG RELEASE
 
-FROM registry.atmosphere.dev/library/openstack-venv-builder:${RELEASE} AS build
+FROM harbor.atmosphere.dev/library/openstack-venv-builder:${RELEASE} AS build
 ARG HEAT_GIT_REF=d3948706a3ff28d0160157f76f1e18244a8dad5c
 ADD --keep-git-dir=true https://opendev.org/openstack/heat.git#${HEAT_GIT_REF} /src/heat
 RUN git -C /src/heat fetch --unshallow
@@ -13,7 +13,7 @@ pip3 install \
         /src/heat
 EOF
 
-FROM registry.atmosphere.dev/library/openstack-python-runtime:${RELEASE}
+FROM harbor.atmosphere.dev/library/openstack-python-runtime:${RELEASE}
 RUN <<EOF bash -xe
 apt-get update -qq
 apt-get install -qq -y --no-install-recommends \
diff --git a/images/horizon/Dockerfile b/images/horizon/Dockerfile
index e80475a06..351f8f862 100644
--- a/images/horizon/Dockerfile
+++ b/images/horizon/Dockerfile
@@ -3,13 +3,13 @@
 
 ARG RELEASE
 
-FROM registry.atmosphere.dev/library/openstack-venv-builder:${RELEASE} AS build
+FROM harbor.atmosphere.dev/library/openstack-venv-builder:${RELEASE} AS build
 ARG HORIZON_GIT_REF=5de40f9b222608d35c5a0919117259e966217a86
 ADD --keep-git-dir=true https://opendev.org/openstack/horizon.git#${HORIZON_GIT_REF} /src/horizon
 RUN git -C /src/horizon fetch --unshallow
 ADD --keep-git-dir=true https://opendev.org/openstack/designate-dashboard.git#unmaintained/zed /src/designate-dashboard
 RUN git -C /src/designate-dashboard fetch --unshallow
-ADD --keep-git-dir=true https://opendev.org/openstack/heat-dashboard.git#unmaintained/zed /src/heat-dashboard
+ADD --keep-git-dir=true https://opendev.org/openstack/heat-dashboard.git/src/tag/zed-eol /src/heat-dashboard
 RUN git -C /src/heat-dashboard fetch --unshallow
 ADD --keep-git-dir=true https://opendev.org/openstack/ironic-ui.git#unmaintained/zed /src/ironic-ui
 RUN git -C /src/ironic-ui fetch --unshallow
@@ -21,7 +21,7 @@ ADD --keep-git-dir=true https://opendev.org/openstack/neutron-vpnaas-dashboard.g
 RUN git -C /src/neutron-vpnaas-dashboard fetch --unshallow
 ADD --keep-git-dir=true https://opendev.org/openstack/octavia-dashboard.git#unmaintained/zed /src/octavia-dashboard
 RUN git -C /src/octavia-dashboard fetch --unshallow
-ADD --keep-git-dir=true https://opendev.org/openstack/senlin-dashboard.git#unmaintained/zed /src/senlin-dashboard
+ADD --keep-git-dir=true https://opendev.org/openstack/senlin-dashboard.git/src/tag/zed-eol
 RUN git -C /src/senlin-dashboard fetch --unshallow
 COPY patches/horizon /patches/horizon
 RUN git -C /src/horizon apply --verbose /patches/horizon/*
@@ -41,7 +41,7 @@ pip3 install \
         /src/senlin-dashboard
 EOF
 
-FROM registry.atmosphere.dev/library/openstack-python-runtime:${RELEASE}
+FROM harbor.atmosphere.dev/library/openstack-python-runtime:${RELEASE}
 RUN <<EOF bash -xe
 apt-get update -qq
 apt-get install -qq -y --no-install-recommends \
diff --git a/images/ironic/Dockerfile b/images/ironic/Dockerfile
index 8003a752b..d4cdaac74 100644
--- a/images/ironic/Dockerfile
+++ b/images/ironic/Dockerfile
@@ -1,9 +1,9 @@
 # SPDX-License-Identifier: Apache-2.0
-# Atmosphere-Rebuild-Time: 2024-06-28T12:14:26Z
+# Atmosphere-Rebuild-Time: 2024-06-26T17:38:39Z
 
 ARG RELEASE
 
-FROM registry.atmosphere.dev/library/openstack-venv-builder:${RELEASE} AS build
+FROM harbor.atmosphere.dev/library/openstack-venv-builder:${RELEASE} AS build
 ARG IRONIC_GIT_REF=d0fb7bce54e9d241a4442ef2347ac51ee1f4d7af
 ADD --keep-git-dir=true https://opendev.org/openstack/ironic.git#${IRONIC_GIT_REF} /src/ironic
 RUN git -C /src/ironic fetch --unshallow
@@ -15,7 +15,7 @@ pip3 install \
         sushy
 EOF
 
-FROM registry.atmosphere.dev/library/openstack-python-runtime:${RELEASE}
+FROM harbor.atmosphere.dev/library/openstack-python-runtime:${RELEASE}
 RUN <<EOF bash -xe
 apt-get update -qq
 apt-get install -qq -y --no-install-recommends \
diff --git a/images/keepalived/Dockerfile b/images/keepalived/Dockerfile
index 1d407ac9d..09a04d645 100644
--- a/images/keepalived/Dockerfile
+++ b/images/keepalived/Dockerfile
@@ -3,7 +3,7 @@
 
 ARG RELEASE
 
-FROM registry.atmosphere.dev/library/ubuntu:${RELEASE}
+FROM harbor.atmosphere.dev/library/ubuntu:${RELEASE}
 RUN <<EOF bash -xe
 apt-get update -qq
 apt-get install -qq -y --no-install-recommends \
diff --git a/images/keystone/Dockerfile b/images/keystone/Dockerfile
index 9a9f64e2a..641ffdd52 100644
--- a/images/keystone/Dockerfile
+++ b/images/keystone/Dockerfile
@@ -3,7 +3,7 @@
 
 ARG RELEASE
 
-FROM registry.atmosphere.dev/library/openstack-venv-builder:${RELEASE} AS build
+FROM harbor.atmosphere.dev/library/openstack-venv-builder:${RELEASE} AS build
 ARG KEYSTONE_GIT_REF=f63062d47712406a807ce07b4ff3ec6213b0e824
 ADD --keep-git-dir=true https://opendev.org/openstack/keystone.git#${KEYSTONE_GIT_REF} /src/keystone
 RUN git -C /src/keystone fetch --unshallow
@@ -16,7 +16,7 @@ pip3 install \
         keystone-keycloak-backend==0.1.8
 EOF
 
-FROM registry.atmosphere.dev/library/openstack-python-runtime:${RELEASE}
+FROM harbor.atmosphere.dev/library/openstack-python-runtime:${RELEASE}
 RUN <<EOF bash -xe
 apt-get update -qq
 apt-get install -qq -y --no-install-recommends \
diff --git a/images/kubernetes-entrypoint/Dockerfile b/images/kubernetes-entrypoint/Dockerfile
index 8ef07ce06..b27599f80 100644
--- a/images/kubernetes-entrypoint/Dockerfile
+++ b/images/kubernetes-entrypoint/Dockerfile
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: Apache-2.0
 # Atmosphere-Rebuild-Time: 2024-06-28T12:14:26Z
 
-FROM golang:1.21 AS build
+FROM harbor.atmosphere.dev/docker.io/library/golang:1.21 AS build
 ARG KUBERNETES_ENTRYPOINT_GIT_REF=4fbcf7ce324dc66e78480f73035e31434cfea1e8
 ADD https://opendev.org/airship/kubernetes-entrypoint.git#${KUBERNETES_ENTRYPOINT_GIT_REF} /src
 WORKDIR /src
diff --git a/images/libvirtd/Dockerfile b/images/libvirtd/Dockerfile
index 396790131..ea2e9730a 100644
--- a/images/libvirtd/Dockerfile
+++ b/images/libvirtd/Dockerfile
@@ -3,7 +3,7 @@
 
 ARG RELEASE
 
-FROM registry.atmosphere.dev/library/openstack-runtime:${RELEASE}
+FROM harbor.atmosphere.dev/library/openstack-runtime:${RELEASE}
 ADD --chmod=644 https://download.ceph.com/keys/release.gpg /etc/apt/trusted.gpg.d/ceph.gpg
 COPY <<EOF /etc/apt/sources.list.d/ceph.list
 deb http://download.ceph.com/debian-reef/ jammy main
diff --git a/images/magnum/Dockerfile b/images/magnum/Dockerfile
index e10bae915..4d4278731 100644
--- a/images/magnum/Dockerfile
+++ b/images/magnum/Dockerfile
@@ -3,7 +3,7 @@
 
 ARG RELEASE
 
-FROM registry.atmosphere.dev/library/ubuntu:${RELEASE} AS helm
+FROM harbor.atmosphere.dev/library/ubuntu:${RELEASE} AS helm
 ARG TARGETOS
 ARG TARGETARCH
 ARG HELM_VERSION=3.14.0
@@ -11,7 +11,7 @@ ADD https://get.helm.sh/helm-v${HELM_VERSION}-${TARGETOS}-${TARGETARCH}.tar.gz /
 RUN tar -xzf /helm.tar.gz
 RUN mv /${TARGETOS}-${TARGETARCH}/helm /usr/bin/helm
 
-FROM registry.atmosphere.dev/library/openstack-venv-builder:${RELEASE} AS build
+FROM harbor.atmosphere.dev/library/openstack-venv-builder:${RELEASE} AS build
 ARG MAGNUM_GIT_REF=0ee979099a01ae2c8b1b5d6757897a8993e4e34c
 ADD --keep-git-dir=true https://opendev.org/openstack/magnum.git#${MAGNUM_GIT_REF} /src/magnum
 RUN git -C /src/magnum fetch --unshallow
@@ -24,7 +24,7 @@ pip3 install \
         magnum-cluster-api==0.24.0
 EOF
 
-FROM registry.atmosphere.dev/library/openstack-python-runtime:${RELEASE}
+FROM harbor.atmosphere.dev/library/openstack-python-runtime:${RELEASE}
 RUN <<EOF bash -xe
 apt-get update -qq
 apt-get install -qq -y --no-install-recommends \
diff --git a/images/manila/Dockerfile b/images/manila/Dockerfile
index 5a3c50c60..09d2bf9d0 100644
--- a/images/manila/Dockerfile
+++ b/images/manila/Dockerfile
@@ -3,7 +3,7 @@
 
 ARG RELEASE
 
-FROM registry.atmosphere.dev/library/openstack-venv-builder:${RELEASE} AS build
+FROM harbor.atmosphere.dev/library/openstack-venv-builder:${RELEASE} AS build
 ARG MANILA_GIT_REF=c0fc23a39f87629b59fae7bbf46f70e3e1b459cd
 ADD --keep-git-dir=true https://opendev.org/openstack/manila.git#${MANILA_GIT_REF} /src/manila
 RUN git -C /src/manila fetch --unshallow
@@ -15,7 +15,7 @@ pip3 install \
         /src/manila
 EOF
 
-FROM registry.atmosphere.dev/library/openstack-python-runtime:${RELEASE}
+FROM harbor.atmosphere.dev/library/openstack-python-runtime:${RELEASE}
 RUN <<EOF bash -xe
 apt-get update -qq
 apt-get install -qq -y --no-install-recommends \
diff --git a/images/netoffload/Dockerfile b/images/netoffload/Dockerfile
index 965b90f84..2407e6f03 100644
--- a/images/netoffload/Dockerfile
+++ b/images/netoffload/Dockerfile
@@ -3,13 +3,13 @@
 
 ARG RELEASE
 
-FROM golang:1.20 AS build
+FROM harbor.atmosphere.dev/docker.io/library/golang:1.20 AS build
 ARG NETOFFLOAD_GIT_REF=94b8c0fdb0b83bd1b7e14b9a58077a047c78a800
 ADD https://github.com/vexxhost/netoffload.git#${NETOFFLOAD_GIT_REF} /src
 WORKDIR /src
 RUN go build -v -o offloadctl ./cmd/offloadctl/main.go
 
-FROM registry.atmosphere.dev/library/ubuntu:${RELEASE}
+FROM harbor.atmosphere.dev/library/ubuntu:${RELEASE}
 RUN <<EOF bash -xe
 apt-get update -qq
 apt-get install -qq -y --no-install-recommends \
diff --git a/images/neutron/Dockerfile b/images/neutron/Dockerfile
index 40d13770b..a933bb9ac 100644
--- a/images/neutron/Dockerfile
+++ b/images/neutron/Dockerfile
@@ -3,7 +3,7 @@
 
 ARG RELEASE
 
-FROM registry.atmosphere.dev/library/openstack-venv-builder:${RELEASE} AS build
+FROM harbor.atmosphere.dev/library/openstack-venv-builder:${RELEASE} AS build
 ARG NEUTRON_GIT_REF=ece6a9a7acab20d5a39f54784427258d54b72cfd
 ADD --keep-git-dir=true https://opendev.org/openstack/neutron.git#${NEUTRON_GIT_REF} /src/neutron
 RUN git -C /src/neutron fetch --unshallow
@@ -27,7 +27,7 @@ pip3 install \
         /src/neutron-ovn-network-logging-parser
 EOF
 
-FROM registry.atmosphere.dev/library/openstack-python-runtime:${RELEASE}
+FROM harbor.atmosphere.dev/library/openstack-python-runtime:${RELEASE}
 RUN <<EOF bash -xe
 apt-get update -qq
 apt-get install -qq -y --no-install-recommends \
diff --git a/images/nova-ssh/Dockerfile b/images/nova-ssh/Dockerfile
index 49bd70062..9f7cbccea 100644
--- a/images/nova-ssh/Dockerfile
+++ b/images/nova-ssh/Dockerfile
@@ -3,7 +3,7 @@
 
 ARG RELEASE
 
-FROM registry.atmosphere.dev/library/openstack-runtime:${RELEASE}
+FROM harbor.atmosphere.dev/library/openstack-runtime:${RELEASE}
 RUN <<EOF bash -xe
 apt-get update -qq
 apt-get install -qq -y --no-install-recommends \
diff --git a/images/nova/Dockerfile b/images/nova/Dockerfile
index beb9f94a3..9b1f259d4 100644
--- a/images/nova/Dockerfile
+++ b/images/nova/Dockerfile
@@ -3,7 +3,7 @@
 
 ARG RELEASE
 
-FROM registry.atmosphere.dev/library/openstack-venv-builder:${RELEASE} AS build
+FROM harbor.atmosphere.dev/library/openstack-venv-builder:${RELEASE} AS build
 ARG NOVA_GIT_REF=ba71dc50dbba82bbdecb845afea67ad2275897ec
 ADD --keep-git-dir=true https://opendev.org/openstack/nova.git#${NOVA_GIT_REF} /src/nova
 RUN git -C /src/nova fetch --unshallow
@@ -25,7 +25,7 @@ ADD --chmod=644 \
     https://github.com/storpool/storpool-openstack-integration/raw/master/drivers/os_brick/openstack/zed/storpool.py \
     /var/lib/openstack/lib/python3.10/site-packages/os_brick/initiator/connectors/storpool.py
 
-FROM registry.atmosphere.dev/library/openstack-python-runtime:${RELEASE}
+FROM harbor.atmosphere.dev/library/openstack-python-runtime:${RELEASE}
 ADD https://github.com/novnc/noVNC.git#v1.4.0 /usr/share/novnc
 RUN <<EOF bash -xe
 apt-get update -qq
diff --git a/images/octavia/Dockerfile b/images/octavia/Dockerfile
index 156584a93..64935132a 100644
--- a/images/octavia/Dockerfile
+++ b/images/octavia/Dockerfile
@@ -3,13 +3,13 @@
 
 ARG RELEASE
 
-FROM registry.atmosphere.dev/library/openstack-venv-builder:${RELEASE} AS build
+FROM harbor.atmosphere.dev/library/openstack-venv-builder:${RELEASE} AS build
 ARG OCTAVIA_GIT_REF=000b577f3e9c9ff7cb893e9f6e635753017a78c6
 ADD --keep-git-dir=true https://opendev.org/openstack/octavia.git#${OCTAVIA_GIT_REF} /src/octavia
 RUN git -C /src/octavia fetch --unshallow
 COPY patches/octavia /patches/octavia
 RUN git -C /src/octavia apply --verbose /patches/octavia/*
-ADD --keep-git-dir=true https://opendev.org/openstack/ovn-octavia-provider.git#unmaintained/zed /src/ovn-octavia-provider
+ADD --keep-git-dir=true https://opendev.org/openstack/ovn-octavia-provider.git/src/tag/zed-eol
 RUN git -C /src/ovn-octavia-provider fetch --unshallow
 RUN --mount=type=cache,mode=0755,target=/root/.cache/pip,sharing=private <<EOF bash -xe
 pip3 install \
@@ -18,7 +18,7 @@ pip3 install \
         /src/ovn-octavia-provider
 EOF
 
-FROM registry.atmosphere.dev/library/openstack-python-runtime:${RELEASE}
+FROM harbor.atmosphere.dev/library/openstack-python-runtime:${RELEASE}
 RUN <<EOF bash -xe
 apt-get update -qq
 apt-get install -qq -y --no-install-recommends \
diff --git a/images/openstack-runtime/Dockerfile b/images/openstack-runtime/Dockerfile
index a70fa06f8..6c1118764 100644
--- a/images/openstack-runtime/Dockerfile
+++ b/images/openstack-runtime/Dockerfile
@@ -3,7 +3,7 @@
 
 ARG RELEASE
 
-ARG FROM=registry.atmosphere.dev/library/ubuntu-cloud-archive:${RELEASE}
+ARG FROM=harbor.atmosphere.dev/library/ubuntu-cloud-archive:${RELEASE}
 FROM ${FROM}
 ONBUILD ARG PROJECT
 ONBUILD ARG SHELL=/usr/sbin/nologin
diff --git a/images/openstack-venv-builder/Dockerfile b/images/openstack-venv-builder/Dockerfile
index 91872fa97..30cab13d4 100644
--- a/images/openstack-venv-builder/Dockerfile
+++ b/images/openstack-venv-builder/Dockerfile
@@ -5,7 +5,7 @@
 
 ARG RELEASE
 
-FROM registry.atmosphere.dev/library/ubuntu-cloud-archive:${RELEASE} AS requirements
+FROM harbor.atmosphere.dev/library/ubuntu-cloud-archive:${RELEASE} AS requirements
 ARG REQUIREMENTS_GIT_REF=b4513973fdd1c3b43159fe0e02fa73d845a9c1ba
 ADD --keep-git-dir=true https://opendev.org/openstack/requirements.git#${REQUIREMENTS_GIT_REF} /src/requirements
 RUN cp /src/requirements/upper-constraints.txt /upper-constraints.txt
@@ -14,7 +14,7 @@ sed -i '/glance-store/d' /upper-constraints.txt
 sed -i '/horizon/d' /upper-constraints.txt
 EOF
 
-FROM registry.atmosphere.dev/library/python-base:${RELEASE}
+FROM harbor.atmosphere.dev/library/python-base:${RELEASE}
 RUN <<EOF bash -xe
 apt-get update -qq
 apt-get install -qq -y --no-install-recommends \
diff --git a/images/ovn/Dockerfile b/images/ovn/Dockerfile
index 02115216b..4d13d529f 100644
--- a/images/ovn/Dockerfile
+++ b/images/ovn/Dockerfile
@@ -3,7 +3,7 @@
 
 ARG RELEASE
 
-FROM golang:1.20 AS ovn-kubernetes
+FROM harbor.atmosphere.dev/docker.io/library/golang:1.20 AS ovn-kubernetes
 ARG OVN_KUBERNETES_REF=5359e7d7f872058b6e5bf884c9f19d1922451f29
 ADD https://github.com/ovn-org/ovn-kubernetes.git#${OVN_KUBERNETES_REF} /src
 COPY patches/ovn-kubernetes /patches/ovn-kubernetes
@@ -13,7 +13,7 @@ cd /src/go-controller
 go build -o /usr/bin/ovn-kube-util ./cmd/ovn-kube-util
 EOF
 
-FROM registry.atmosphere.dev/library/openvswitch:${RELEASE}
+FROM harbor.atmosphere.dev/library/openvswitch:${RELEASE}
 ARG TARGETPLATFORM
 ADD --chmod=755 https://dl.k8s.io/release/v1.29.3/bin/${TARGETPLATFORM}/kubectl /usr/local/bin/kubectl
 ARG OVN_SERIES=23.03
diff --git a/images/placement/Dockerfile b/images/placement/Dockerfile
index 57224f830..cc7cc0643 100644
--- a/images/placement/Dockerfile
+++ b/images/placement/Dockerfile
@@ -3,7 +3,7 @@
 
 ARG RELEASE
 
-FROM registry.atmosphere.dev/library/openstack-venv-builder:${RELEASE} AS build
+FROM harbor.atmosphere.dev/library/openstack-venv-builder:${RELEASE} AS build
 ARG PLACEMENT_GIT_REF=d7ced6bd2fc82caf458f20b5652888164b1bbb70
 ADD --keep-git-dir=true https://opendev.org/openstack/placement.git#${PLACEMENT_GIT_REF} /src/placement
 RUN git -C /src/placement fetch --unshallow
@@ -13,5 +13,5 @@ pip3 install \
         /src/placement
 EOF
 
-FROM registry.atmosphere.dev/library/openstack-python-runtime:${RELEASE}
+FROM harbor.atmosphere.dev/library/openstack-python-runtime:${RELEASE}
 COPY --from=build --link /var/lib/openstack /var/lib/openstack
diff --git a/images/python-base/Dockerfile b/images/python-base/Dockerfile
index d9b547bab..80c1d0e60 100644
--- a/images/python-base/Dockerfile
+++ b/images/python-base/Dockerfile
@@ -3,7 +3,7 @@
 
 ARG RELEASE
 
-FROM registry.atmosphere.dev/library/ubuntu-cloud-archive:${RELEASE}
+FROM harbor.atmosphere.dev/library/ubuntu-cloud-archive:${RELEASE}
 ENV PATH=/var/lib/openstack/bin:$PATH
 RUN \
     apt-get update -qq && \
diff --git a/images/python-openstackclient/Dockerfile b/images/python-openstackclient/Dockerfile
index d00674368..46896b338 100644
--- a/images/python-openstackclient/Dockerfile
+++ b/images/python-openstackclient/Dockerfile
@@ -3,7 +3,7 @@
 
 ARG RELEASE
 
-FROM registry.atmosphere.dev/library/openstack-venv-builder:${RELEASE} AS build
+FROM harbor.atmosphere.dev/library/openstack-venv-builder:${RELEASE} AS build
 RUN --mount=type=cache,mode=0755,target=/root/.cache/pip,sharing=private <<EOF bash -xe
 pip3 install \
     --constraint /upper-constraints.txt \
@@ -22,7 +22,7 @@ pip3 install \
         python-swiftclient
 EOF
 
-FROM registry.atmosphere.dev/library/python-base:${RELEASE}
+FROM harbor.atmosphere.dev/library/python-base:${RELEASE}
 COPY --from=build --link /var/lib/openstack /var/lib/openstack
 
 # NOTE(mnaser): The Magnum client relies on the SHELL environment variable
diff --git a/images/staffeln/Dockerfile b/images/staffeln/Dockerfile
index f153115bd..7212cfc73 100644
--- a/images/staffeln/Dockerfile
+++ b/images/staffeln/Dockerfile
@@ -3,7 +3,7 @@
 
 ARG RELEASE
 
-FROM registry.atmosphere.dev/library/openstack-venv-builder:${RELEASE} AS build
+FROM harbor.atmosphere.dev/library/openstack-venv-builder:${RELEASE} AS build
 ARG STAFFELN_GIT_REF=v2.2.3
 ADD --keep-git-dir=true https://github.com/vexxhost/staffeln.git#${STAFFELN_GIT_REF} /src/staffeln
 RUN git -C /src/staffeln fetch --unshallow
@@ -13,5 +13,5 @@ pip3 install \
         /src/staffeln
 EOF
 
-FROM registry.atmosphere.dev/library/openstack-python-runtime:${RELEASE}
+FROM harbor.atmosphere.dev/library/openstack-python-runtime:${RELEASE}
 COPY --from=build --link /var/lib/openstack /var/lib/openstack
diff --git a/images/tempest/Dockerfile b/images/tempest/Dockerfile
index 57cd67dcc..cc0659231 100644
--- a/images/tempest/Dockerfile
+++ b/images/tempest/Dockerfile
@@ -3,14 +3,14 @@
 
 ARG RELEASE
 
-FROM golang:1.18 AS octavia-test-server
+FROM harbor.atmosphere.dev/docker.io/library/golang:1.18 AS octavia-test-server
 ADD --keep-git-dir=true https://opendev.org/openstack/octavia-tempest-plugin.git#master /src
 RUN GO111MODULE=off CGO_ENABLED=0 GOOS=linux go build \
     -a -ldflags '-s -w -extldflags -static' \
     -o /build/test_server.bin \
     /src/octavia_tempest_plugin/contrib/test_server/test_server.go
 
-FROM registry.atmosphere.dev/library/openstack-venv-builder:${RELEASE} AS build
+FROM harbor.atmosphere.dev/library/openstack-venv-builder:${RELEASE} AS build
 ARG TEMPEST_GIT_REF=aeb9b13e930841c87b826d3ba917b224095f1d81
 ADD --keep-git-dir=true https://opendev.org/openstack/tempest.git#${TEMPEST_GIT_REF} /src/tempest
 RUN git -C /src/tempest fetch --unshallow
@@ -39,7 +39,7 @@ pip3 install \
         /src/octavia-tempest-plugin
 EOF
 
-FROM registry.atmosphere.dev/library/openstack-python-runtime:${RELEASE}
+FROM harbor.atmosphere.dev/library/openstack-python-runtime:${RELEASE}
 RUN <<EOF bash -xe
 apt-get update -qq
 apt-get install -qq -y --no-install-recommends \
diff --git a/images/ubuntu-cloud-archive/Dockerfile b/images/ubuntu-cloud-archive/Dockerfile
index 7ebeca6ad..f306c2242 100644
--- a/images/ubuntu-cloud-archive/Dockerfile
+++ b/images/ubuntu-cloud-archive/Dockerfile
@@ -3,7 +3,7 @@
 
 ARG RELEASE
 
-FROM registry.atmosphere.dev/library/ubuntu:${RELEASE}
+FROM harbor.atmosphere.dev/library/ubuntu:${RELEASE}
 COPY trusted.gpg.d/ubuntu-cloud-keyring.gpg /etc/apt/trusted.gpg.d/ubuntu-cloud-keyring.gpg
 COPY <<EOF /etc/apt/sources.list.d/cloudarchive.list
 deb http://ubuntu-cloud.archive.canonical.com/ubuntu jammy-updates/zed main
diff --git a/images/ubuntu/Dockerfile b/images/ubuntu/Dockerfile
index 76a624ec2..5f5e07285 100644
--- a/images/ubuntu/Dockerfile
+++ b/images/ubuntu/Dockerfile
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 # Atmosphere-Rebuild-Time: 2024-06-28T12:14:26Z
 
-FROM ubuntu:jammy-20240227
+FROM harbor.atmosphere.dev/docker.io/library/ubuntu:jammy-20240227
 LABEL org.opencontainers.image.source=https://github.com/vexxhost/atmosphere
diff --git a/molecule/csi/verify.yml b/molecule/csi/verify.yml
index 5f5fa5483..1cadf2285 100644
--- a/molecule/csi/verify.yml
+++ b/molecule/csi/verify.yml
@@ -49,7 +49,7 @@
                   claimName: test-pvc
             containers:
               - name: test-pvc-pod-container
-                image: registry.atmosphere.dev/docker.io/library/nginx:1.25
+                image: harbor.atmosphere.dev/docker.io/library/nginx:1.25
                 volumeMounts:
                   - name: test-pvc
                     mountPath: /usr/share/nginx/html
diff --git a/tox.ini b/tox.ini
index 34519ebfa..622a3fe8b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -47,7 +47,7 @@ passenv =
   ATMOSPHERE_*
   OS_*
 deps =
-  molecule
+  molecule==24.9.0
   kubernetes
   oslotest
   stestr
diff --git a/zuul.d/container-images/barbican.yaml b/zuul.d/container-images/barbican.yaml
index da767db80..3a9caa8c1 100644
--- a/zuul.d/container-images/barbican.yaml
+++ b/zuul.d/container-images/barbican.yaml
@@ -43,8 +43,8 @@
       promote_container_image_job: atmosphere-upload-container-image-barbican
       container_images:
         - context: images/barbican
-          registry: registry.atmosphere.dev
-          repository: registry.atmosphere.dev/library/barbican
+          registry: harbor.atmosphere.dev
+          repository: harbor.atmosphere.dev/library/barbican
           arch:
             - linux/amd64
           build_args:
diff --git a/zuul.d/container-images/base.yaml b/zuul.d/container-images/base.yaml
index 021dbfce5..32567c5f8 100644
--- a/zuul.d/container-images/base.yaml
+++ b/zuul.d/container-images/base.yaml
@@ -39,7 +39,7 @@
         - ['docker.io', 'https://registry-1.docker.io']
         - ['quay.io', 'https://quay.io']
         - ['gcr.io', 'https://gcr.io']
-        - ['registry.atmosphere.dev', 'https://registry.atmosphere.dev']
+        - ['harbor.atmosphere.dev', 'https://harbor.atmosphere.dev']
 
 - job:
     name: atmosphere-upload-container-image
diff --git a/zuul.d/container-images/cinder.yaml b/zuul.d/container-images/cinder.yaml
index 55c9442b8..a755adfdf 100644
--- a/zuul.d/container-images/cinder.yaml
+++ b/zuul.d/container-images/cinder.yaml
@@ -43,8 +43,8 @@
       promote_container_image_job: atmosphere-upload-container-image-cinder
       container_images:
         - context: images/cinder
-          registry: registry.atmosphere.dev
-          repository: registry.atmosphere.dev/library/cinder
+          registry: harbor.atmosphere.dev
+          repository: harbor.atmosphere.dev/library/cinder
           arch:
             - linux/amd64
           build_args:
diff --git a/zuul.d/container-images/designate.yaml b/zuul.d/container-images/designate.yaml
index bfc3c6a5b..41be3a737 100644
--- a/zuul.d/container-images/designate.yaml
+++ b/zuul.d/container-images/designate.yaml
@@ -43,8 +43,8 @@
       promote_container_image_job: atmosphere-upload-container-image-designate
       container_images:
         - context: images/designate
-          registry: registry.atmosphere.dev
-          repository: registry.atmosphere.dev/library/designate
+          registry: harbor.atmosphere.dev
+          repository: harbor.atmosphere.dev/library/designate
           arch:
             - linux/amd64
           build_args:
diff --git a/zuul.d/container-images/glance.yaml b/zuul.d/container-images/glance.yaml
index 6f92bedda..f158d3506 100644
--- a/zuul.d/container-images/glance.yaml
+++ b/zuul.d/container-images/glance.yaml
@@ -43,8 +43,8 @@
       promote_container_image_job: atmosphere-upload-container-image-glance
       container_images:
         - context: images/glance
-          registry: registry.atmosphere.dev
-          repository: registry.atmosphere.dev/library/glance
+          registry: harbor.atmosphere.dev
+          repository: harbor.atmosphere.dev/library/glance
           arch:
             - linux/amd64
           build_args:
diff --git a/zuul.d/container-images/heat.yaml b/zuul.d/container-images/heat.yaml
index 5b4087eaa..4c2fd87ac 100644
--- a/zuul.d/container-images/heat.yaml
+++ b/zuul.d/container-images/heat.yaml
@@ -43,8 +43,8 @@
       promote_container_image_job: atmosphere-upload-container-image-heat
       container_images:
         - context: images/heat
-          registry: registry.atmosphere.dev
-          repository: registry.atmosphere.dev/library/heat
+          registry: harbor.atmosphere.dev
+          repository: harbor.atmosphere.dev/library/heat
           arch:
             - linux/amd64
           build_args:
diff --git a/zuul.d/container-images/horizon.yaml b/zuul.d/container-images/horizon.yaml
index a9de5a2e1..d3a713eba 100644
--- a/zuul.d/container-images/horizon.yaml
+++ b/zuul.d/container-images/horizon.yaml
@@ -43,8 +43,8 @@
       promote_container_image_job: atmosphere-upload-container-image-horizon
       container_images:
         - context: images/horizon
-          registry: registry.atmosphere.dev
-          repository: registry.atmosphere.dev/library/horizon
+          registry: harbor.atmosphere.dev
+          repository: harbor.atmosphere.dev/library/horizon
           arch:
             - linux/amd64
           build_args:
diff --git a/zuul.d/container-images/ironic.yaml b/zuul.d/container-images/ironic.yaml
index 780a02cc3..18403e048 100644
--- a/zuul.d/container-images/ironic.yaml
+++ b/zuul.d/container-images/ironic.yaml
@@ -43,8 +43,8 @@
       promote_container_image_job: atmosphere-upload-container-image-ironic
       container_images:
         - context: images/ironic
-          registry: registry.atmosphere.dev
-          repository: registry.atmosphere.dev/library/ironic
+          registry: harbor.atmosphere.dev
+          repository: harbor.atmosphere.dev/library/ironic
           arch:
             - linux/amd64
           build_args:
diff --git a/zuul.d/container-images/keepalived.yaml b/zuul.d/container-images/keepalived.yaml
index 81b18f053..e4f55cec2 100644
--- a/zuul.d/container-images/keepalived.yaml
+++ b/zuul.d/container-images/keepalived.yaml
@@ -35,8 +35,8 @@
       promote_container_image_job: atmosphere-upload-container-image-keepalived
       container_images:
         - context: images/keepalived
-          registry: registry.atmosphere.dev
-          repository: registry.atmosphere.dev/library/keepalived
+          registry: harbor.atmosphere.dev
+          repository: harbor.atmosphere.dev/library/keepalived
           arch:
             - linux/amd64
           build_args:
diff --git a/zuul.d/container-images/keystone.yaml b/zuul.d/container-images/keystone.yaml
index 74f04b2ec..d3bc1b763 100644
--- a/zuul.d/container-images/keystone.yaml
+++ b/zuul.d/container-images/keystone.yaml
@@ -43,8 +43,8 @@
       promote_container_image_job: atmosphere-upload-container-image-keystone
       container_images:
         - context: images/keystone
-          registry: registry.atmosphere.dev
-          repository: registry.atmosphere.dev/library/keystone
+          registry: harbor.atmosphere.dev
+          repository: harbor.atmosphere.dev/library/keystone
           arch:
             - linux/amd64
           build_args:
diff --git a/zuul.d/container-images/kubernetes-entrypoint.yaml b/zuul.d/container-images/kubernetes-entrypoint.yaml
index b11ef16c8..03a2a396f 100644
--- a/zuul.d/container-images/kubernetes-entrypoint.yaml
+++ b/zuul.d/container-images/kubernetes-entrypoint.yaml
@@ -33,8 +33,8 @@
       promote_container_image_job: atmosphere-upload-container-image-kubernetes-entrypoint
       container_images:
         - context: images/kubernetes-entrypoint
-          registry: registry.atmosphere.dev
-          repository: registry.atmosphere.dev/library/kubernetes-entrypoint
+          registry: harbor.atmosphere.dev
+          repository: harbor.atmosphere.dev/library/kubernetes-entrypoint
           arch:
             - linux/amd64
             - linux/arm64
diff --git a/zuul.d/container-images/libvirtd.yaml b/zuul.d/container-images/libvirtd.yaml
index 4fd0cefc1..f77f45e99 100644
--- a/zuul.d/container-images/libvirtd.yaml
+++ b/zuul.d/container-images/libvirtd.yaml
@@ -39,8 +39,8 @@
       promote_container_image_job: atmosphere-upload-container-image-libvirtd
       container_images:
         - context: images/libvirtd
-          registry: registry.atmosphere.dev
-          repository: registry.atmosphere.dev/library/libvirtd
+          registry: harbor.atmosphere.dev
+          repository: harbor.atmosphere.dev/library/libvirtd
           arch:
             - linux/amd64
             - linux/arm64
diff --git a/zuul.d/container-images/magnum.yaml b/zuul.d/container-images/magnum.yaml
index bfa764e61..2772c954e 100644
--- a/zuul.d/container-images/magnum.yaml
+++ b/zuul.d/container-images/magnum.yaml
@@ -43,8 +43,8 @@
       promote_container_image_job: atmosphere-upload-container-image-magnum
       container_images:
         - context: images/magnum
-          registry: registry.atmosphere.dev
-          repository: registry.atmosphere.dev/library/magnum
+          registry: harbor.atmosphere.dev
+          repository: harbor.atmosphere.dev/library/magnum
           arch:
             - linux/amd64
             - linux/arm64
diff --git a/zuul.d/container-images/manila.yaml b/zuul.d/container-images/manila.yaml
index ad298ff81..893f9fe1c 100644
--- a/zuul.d/container-images/manila.yaml
+++ b/zuul.d/container-images/manila.yaml
@@ -43,8 +43,8 @@
       promote_container_image_job: atmosphere-upload-container-image-manila
       container_images:
         - context: images/manila
-          registry: registry.atmosphere.dev
-          repository: registry.atmosphere.dev/library/manila
+          registry: harbor.atmosphere.dev
+          repository: harbor.atmosphere.dev/library/manila
           arch:
             - linux/amd64
           build_args:
diff --git a/zuul.d/container-images/netoffload.yaml b/zuul.d/container-images/netoffload.yaml
index 50620c577..4e23e9ef4 100644
--- a/zuul.d/container-images/netoffload.yaml
+++ b/zuul.d/container-images/netoffload.yaml
@@ -35,8 +35,8 @@
       promote_container_image_job: atmosphere-upload-container-image-netoffload
       container_images:
         - context: images/netoffload
-          registry: registry.atmosphere.dev
-          repository: registry.atmosphere.dev/library/netoffload
+          registry: harbor.atmosphere.dev
+          repository: harbor.atmosphere.dev/library/netoffload
           arch:
             - linux/amd64
           build_args:
diff --git a/zuul.d/container-images/neutron.yaml b/zuul.d/container-images/neutron.yaml
index 66ce8aa5e..54594fd14 100644
--- a/zuul.d/container-images/neutron.yaml
+++ b/zuul.d/container-images/neutron.yaml
@@ -43,8 +43,8 @@
       promote_container_image_job: atmosphere-upload-container-image-neutron
       container_images:
         - context: images/neutron
-          registry: registry.atmosphere.dev
-          repository: registry.atmosphere.dev/library/neutron
+          registry: harbor.atmosphere.dev
+          repository: harbor.atmosphere.dev/library/neutron
           arch:
             - linux/amd64
             - linux/arm64
diff --git a/zuul.d/container-images/nova-ssh.yaml b/zuul.d/container-images/nova-ssh.yaml
index b38faf47a..5d3e337d4 100644
--- a/zuul.d/container-images/nova-ssh.yaml
+++ b/zuul.d/container-images/nova-ssh.yaml
@@ -39,8 +39,8 @@
       promote_container_image_job: atmosphere-upload-container-image-nova-ssh
       container_images:
         - context: images/nova-ssh
-          registry: registry.atmosphere.dev
-          repository: registry.atmosphere.dev/library/nova-ssh
+          registry: harbor.atmosphere.dev
+          repository: harbor.atmosphere.dev/library/nova-ssh
           arch:
             - linux/amd64
             - linux/arm64
diff --git a/zuul.d/container-images/nova.yaml b/zuul.d/container-images/nova.yaml
index fcb1382e4..f377b8a5a 100644
--- a/zuul.d/container-images/nova.yaml
+++ b/zuul.d/container-images/nova.yaml
@@ -43,8 +43,8 @@
       promote_container_image_job: atmosphere-upload-container-image-nova
       container_images:
         - context: images/nova
-          registry: registry.atmosphere.dev
-          repository: registry.atmosphere.dev/library/nova
+          registry: harbor.atmosphere.dev
+          repository: harbor.atmosphere.dev/library/nova
           arch:
             - linux/amd64
             - linux/arm64
diff --git a/zuul.d/container-images/octavia.yaml b/zuul.d/container-images/octavia.yaml
index d7c74ac86..7912168fe 100644
--- a/zuul.d/container-images/octavia.yaml
+++ b/zuul.d/container-images/octavia.yaml
@@ -43,8 +43,8 @@
       promote_container_image_job: atmosphere-upload-container-image-octavia
       container_images:
         - context: images/octavia
-          registry: registry.atmosphere.dev
-          repository: registry.atmosphere.dev/library/octavia
+          registry: harbor.atmosphere.dev
+          repository: harbor.atmosphere.dev/library/octavia
           arch:
             - linux/amd64
           build_args:
diff --git a/zuul.d/container-images/openstack-python-runtime.yaml b/zuul.d/container-images/openstack-python-runtime.yaml
index c3bbe0156..eaa403c3f 100644
--- a/zuul.d/container-images/openstack-python-runtime.yaml
+++ b/zuul.d/container-images/openstack-python-runtime.yaml
@@ -39,14 +39,14 @@
       promote_container_image_job: atmosphere-upload-container-image-openstack-python-runtime
       container_images:
         - context: images/openstack-runtime
-          registry: registry.atmosphere.dev
-          repository: registry.atmosphere.dev/library/openstack-python-runtime
+          registry: harbor.atmosphere.dev
+          repository: harbor.atmosphere.dev/library/openstack-python-runtime
           arch:
             - linux/amd64
             - linux/arm64
           build_args:
             - "RELEASE={{ zuul.branch | replace('stable/', '') }}"
-            - "FROM=registry.atmosphere.dev/library/python-base:{{ zuul.branch | replace('stable/', '') }}"
+            - "FROM=harbor.atmosphere.dev/library/python-base:{{ zuul.branch | replace('stable/', '') }}"
           tags:
             - "{{ zuul.branch | replace('stable/', '') }}"
     files: &container_image_files
diff --git a/zuul.d/container-images/openstack-runtime.yaml b/zuul.d/container-images/openstack-runtime.yaml
index 45036da14..33f52981f 100644
--- a/zuul.d/container-images/openstack-runtime.yaml
+++ b/zuul.d/container-images/openstack-runtime.yaml
@@ -37,8 +37,8 @@
       promote_container_image_job: atmosphere-upload-container-image-openstack-runtime
       container_images:
         - context: images/openstack-runtime
-          registry: registry.atmosphere.dev
-          repository: registry.atmosphere.dev/library/openstack-runtime
+          registry: harbor.atmosphere.dev
+          repository: harbor.atmosphere.dev/library/openstack-runtime
           arch:
             - linux/amd64
             - linux/arm64
diff --git a/zuul.d/container-images/openstack-venv-builder.yaml b/zuul.d/container-images/openstack-venv-builder.yaml
index e5dabfb09..844d203f3 100644
--- a/zuul.d/container-images/openstack-venv-builder.yaml
+++ b/zuul.d/container-images/openstack-venv-builder.yaml
@@ -39,8 +39,8 @@
       promote_container_image_job: atmosphere-upload-container-image-openstack-venv-builder
       container_images:
         - context: images/openstack-venv-builder
-          registry: registry.atmosphere.dev
-          repository: registry.atmosphere.dev/library/openstack-venv-builder
+          registry: harbor.atmosphere.dev
+          repository: harbor.atmosphere.dev/library/openstack-venv-builder
           arch:
             - linux/amd64
             - linux/arm64
diff --git a/zuul.d/container-images/openvswitch.yaml b/zuul.d/container-images/openvswitch.yaml
index e2345e2be..f11caec6d 100644
--- a/zuul.d/container-images/openvswitch.yaml
+++ b/zuul.d/container-images/openvswitch.yaml
@@ -33,8 +33,8 @@
       promote_container_image_job: atmosphere-upload-container-image-openvswitch
       container_images:
         - context: images/openvswitch
-          registry: registry.atmosphere.dev
-          repository: registry.atmosphere.dev/library/openvswitch
+          registry: harbor.atmosphere.dev
+          repository: harbor.atmosphere.dev/library/openvswitch
           arch:
             - linux/amd64
             - linux/arm64
diff --git a/zuul.d/container-images/ovn.yaml b/zuul.d/container-images/ovn.yaml
index e7735cb1b..83d4aca85 100644
--- a/zuul.d/container-images/ovn.yaml
+++ b/zuul.d/container-images/ovn.yaml
@@ -35,8 +35,8 @@
       promote_container_image_job: atmosphere-upload-container-image-ovn
       container_images:
         - context: images/ovn
-          registry: registry.atmosphere.dev
-          repository: registry.atmosphere.dev/library/ovn-central
+          registry: harbor.atmosphere.dev
+          repository: harbor.atmosphere.dev/library/ovn-central
           arch:
             - linux/amd64
           build_args:
@@ -45,8 +45,8 @@
           tags:
             - "{{ zuul.branch | replace('stable/', '') }}"
         - context: images/ovn
-          registry: registry.atmosphere.dev
-          repository: registry.atmosphere.dev/library/ovn-host
+          registry: harbor.atmosphere.dev
+          repository: harbor.atmosphere.dev/library/ovn-host
           arch:
             - linux/amd64
             - linux/arm64
diff --git a/zuul.d/container-images/placement.yaml b/zuul.d/container-images/placement.yaml
index a3a024d2b..c892dc47f 100644
--- a/zuul.d/container-images/placement.yaml
+++ b/zuul.d/container-images/placement.yaml
@@ -43,8 +43,8 @@
       promote_container_image_job: atmosphere-upload-container-image-placement
       container_images:
         - context: images/placement
-          registry: registry.atmosphere.dev
-          repository: registry.atmosphere.dev/library/placement
+          registry: harbor.atmosphere.dev
+          repository: harbor.atmosphere.dev/library/placement
           arch:
             - linux/amd64
           build_args:
diff --git a/zuul.d/container-images/python-base.yaml b/zuul.d/container-images/python-base.yaml
index 5faec22bf..dae0fd39c 100644
--- a/zuul.d/container-images/python-base.yaml
+++ b/zuul.d/container-images/python-base.yaml
@@ -37,8 +37,8 @@
       promote_container_image_job: atmosphere-upload-container-image-python-base
       container_images:
         - context: images/python-base
-          registry: registry.atmosphere.dev
-          repository: registry.atmosphere.dev/library/python-base
+          registry: harbor.atmosphere.dev
+          repository: harbor.atmosphere.dev/library/python-base
           arch:
             - linux/amd64
             - linux/arm64
diff --git a/zuul.d/container-images/python-openstackclient.yaml b/zuul.d/container-images/python-openstackclient.yaml
index f6c456666..f05b9b51a 100644
--- a/zuul.d/container-images/python-openstackclient.yaml
+++ b/zuul.d/container-images/python-openstackclient.yaml
@@ -41,8 +41,8 @@
       promote_container_image_job: atmosphere-upload-container-image-python-openstackclient
       container_images:
         - context: images/python-openstackclient
-          registry: registry.atmosphere.dev
-          repository: registry.atmosphere.dev/library/python-openstackclient
+          registry: harbor.atmosphere.dev
+          repository: harbor.atmosphere.dev/library/python-openstackclient
           arch:
             - linux/amd64
           build_args:
diff --git a/zuul.d/container-images/staffeln.yaml b/zuul.d/container-images/staffeln.yaml
index 7cecc3986..30cb9202b 100644
--- a/zuul.d/container-images/staffeln.yaml
+++ b/zuul.d/container-images/staffeln.yaml
@@ -43,8 +43,8 @@
       promote_container_image_job: atmosphere-upload-container-image-staffeln
       container_images:
         - context: images/staffeln
-          registry: registry.atmosphere.dev
-          repository: registry.atmosphere.dev/library/staffeln
+          registry: harbor.atmosphere.dev
+          repository: harbor.atmosphere.dev/library/staffeln
           arch:
             - linux/amd64
           build_args:
diff --git a/zuul.d/container-images/tempest.yaml b/zuul.d/container-images/tempest.yaml
index 1a979e2b9..ead0bdb6c 100644
--- a/zuul.d/container-images/tempest.yaml
+++ b/zuul.d/container-images/tempest.yaml
@@ -43,8 +43,8 @@
       promote_container_image_job: atmosphere-upload-container-image-tempest
       container_images:
         - context: images/tempest
-          registry: registry.atmosphere.dev
-          repository: registry.atmosphere.dev/library/tempest
+          registry: harbor.atmosphere.dev
+          repository: harbor.atmosphere.dev/library/tempest
           arch:
             - linux/amd64
           build_args:
diff --git a/zuul.d/container-images/ubuntu-cloud-archive.yaml b/zuul.d/container-images/ubuntu-cloud-archive.yaml
index f4a62cabd..aab44f82d 100644
--- a/zuul.d/container-images/ubuntu-cloud-archive.yaml
+++ b/zuul.d/container-images/ubuntu-cloud-archive.yaml
@@ -35,8 +35,8 @@
       promote_container_image_job: atmosphere-upload-container-image-ubuntu-cloud-archive
       container_images:
         - context: images/ubuntu-cloud-archive
-          registry: registry.atmosphere.dev
-          repository: registry.atmosphere.dev/library/ubuntu-cloud-archive
+          registry: harbor.atmosphere.dev
+          repository: harbor.atmosphere.dev/library/ubuntu-cloud-archive
           arch:
             - linux/amd64
             - linux/arm64
diff --git a/zuul.d/container-images/ubuntu.yaml b/zuul.d/container-images/ubuntu.yaml
index 86d736305..6c90f699f 100644
--- a/zuul.d/container-images/ubuntu.yaml
+++ b/zuul.d/container-images/ubuntu.yaml
@@ -33,8 +33,8 @@
       promote_container_image_job: atmosphere-upload-container-image-ubuntu
       container_images:
         - context: images/ubuntu
-          registry: registry.atmosphere.dev
-          repository: registry.atmosphere.dev/library/ubuntu
+          registry: harbor.atmosphere.dev
+          repository: harbor.atmosphere.dev/library/ubuntu
           arch:
             - linux/amd64
             - linux/arm64
diff --git a/zuul.d/playbooks/common/switch-to-atmosphere-mirror.yml b/zuul.d/playbooks/common/switch-to-atmosphere-mirror.yml
index c92532157..839841b5e 100644
--- a/zuul.d/playbooks/common/switch-to-atmosphere-mirror.yml
+++ b/zuul.d/playbooks/common/switch-to-atmosphere-mirror.yml
@@ -1,10 +1,16 @@
 - name: Switch to Atmosphere image mirror
   hosts: all
   tasks:
+    - name: Switch all images out of the CDN
+      ansible.builtin.replace:
+        path: "{{ zuul.project.src_dir }}/roles/defaults/vars/main.yml"
+        regexp: 'registry.atmosphere.dev'
+        replace: 'harbor.atmosphere.dev'
+
     # TODO(mnaser): Drop this when we can use https://github.com/vexxhost/atmosphere/pull/977
     - name: Prefix all images for the job to point to mirror
       ansible.builtin.shell: |
-        sed -i '/registry.atmosphere.dev/!s/  \(.*\): \(.*\)$/  \1: registry.atmosphere.dev\/\2/' roles/defaults/vars/main.yml
+        sed -i '/harbor.atmosphere.dev/!s/  \(.*\): \(.*\)$/  \1: harbor.atmosphere.dev\/\2/' roles/defaults/vars/main.yml
       args:
         chdir: "{{ zuul.project.src_dir }}"
 
diff --git a/zuul.d/secrets.yaml b/zuul.d/secrets.yaml
index 0c59229ed..b9ed6034a 100644
--- a/zuul.d/secrets.yaml
+++ b/zuul.d/secrets.yaml
@@ -13,9 +13,9 @@
 # under the License.
 
 - secret:
-    name: atmosphere-registry-credentials
+    name: atmosphere-harbor-credentials
     data:
-      registry.atmosphere.dev:
+      harbor.atmosphere.dev:
         username: robot$zuul
         password: !encrypted/pkcs1-oaep
           - OOykjodZE21qsYYLpzplp+PV0QbsKQ1B3+kI7bY97VQI/d5RlewqlNABc10eQnyYFSDvq