Switch to building with Depot

Change-Id: I4547e671e11f76e6776192cc68040d5e2ff61be9
diff --git a/zuul.d/container-images/barbican.yaml b/zuul.d/container-images/barbican.yaml
deleted file mode 100644
index ca1f0c0..0000000
--- a/zuul.d/container-images/barbican.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright (c) 2024 VEXXHOST, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-- project:
-    check:
-      jobs:
-        - atmosphere-build-container-image-barbican
-    gate:
-      jobs:
-        - atmosphere-build-container-image-barbican
-    promote:
-      jobs:
-        - atmosphere-promote-container-image-barbican
-
-- job:
-    name: atmosphere-build-container-image-barbican
-    parent: atmosphere-build-container-image
-    dependencies:
-      - name: atmosphere-buildset-registry
-        soft: false
-      - name: atmosphere-build-container-image-ubuntu
-        soft: true
-      - name: atmosphere-build-container-image-ubuntu-cloud-archive
-        soft: true
-      - name: atmosphere-build-container-image-python-base
-        soft: true
-      - name: atmosphere-build-container-image-openstack-venv-builder
-        soft: true
-      - name: atmosphere-build-container-image-openstack-python-runtime
-        soft: true
-    vars: &container_image_vars
-      promote_container_image_job: atmosphere-build-container-image-barbican
-      container_images:
-        - context: images/barbican
-          registry: harbor.atmosphere.dev
-          repository: "{{ container_registry }}/barbican"
-          arch:
-            - linux/amd64
-          build_args:
-            - REGISTRY={{ container_registry }}
-            - "RELEASE={{ zuul.branch | replace('stable/', '') }}"
-            - PROJECT=barbican
-          tags:
-            - "{{ zuul.branch | replace('stable/', '') }}"
-    files: &container_image_files
-      - images/ubuntu/.*
-      - images/ubuntu-cloud-archive/.*
-      - images/python-base/.*
-      - images/openstack-venv-builder/.*
-      - images/openstack-python-runtime/.*
-      - images/barbican/.*
-
-- job:
-    name: atmosphere-promote-container-image-barbican
-    parent: atmosphere-promote-container-image
-    vars: *container_image_vars
-    files: *container_image_files
diff --git a/zuul.d/container-images/base.yaml b/zuul.d/container-images/base.yaml
deleted file mode 100644
index 5be0310..0000000
--- a/zuul.d/container-images/base.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright (c) 2024 VEXXHOST, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-- project:
-    check:
-      jobs:
-        - atmosphere-buildset-registry
-    gate:
-      jobs:
-        - atmosphere-buildset-registry
-
-- job:
-    name: atmosphere-buildset-registry
-    parent: ci-buildset-registry
-    irrelevant-files:
-      - ^build/
-      - ^doc/
-      - ^releasenotes/
-
-- job:
-    name: atmosphere-build-container-image
-    parent: ci-build-container-image
-    abstract: true
-    irrelevant-files:
-      - ^build/
-      - ^doc/
-      - ^releasenotes/
-    vars: &image_vars
-      container_command: docker
-      promote_container_image_method: intermediate-registry
-      buildset_registry_namespaces:
-        - ['docker.io', 'https://registry-1.docker.io']
-        - ['quay.io', 'https://quay.io']
-        - ['gcr.io', 'https://gcr.io']
-        - ['harbor.atmosphere.dev', 'https://harbor.atmosphere.dev']
-
-- job:
-    name: atmosphere-promote-container-image
-    parent: ci-promote-container-image
-    irrelevant-files:
-      - ^build/
-      - ^doc/
-      - ^releasenotes/
-    nodeset:
-      nodes: []
-    vars: *image_vars
diff --git a/zuul.d/container-images/cinder.yaml b/zuul.d/container-images/cinder.yaml
deleted file mode 100644
index e5393ba..0000000
--- a/zuul.d/container-images/cinder.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright (c) 2024 VEXXHOST, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-- project:
-    check:
-      jobs:
-        - atmosphere-build-container-image-cinder
-    gate:
-      jobs:
-        - atmosphere-build-container-image-cinder
-    promote:
-      jobs:
-        - atmosphere-promote-container-image-cinder
-
-- job:
-    name: atmosphere-build-container-image-cinder
-    parent: atmosphere-build-container-image
-    dependencies:
-      - name: atmosphere-buildset-registry
-        soft: false
-      - name: atmosphere-build-container-image-ubuntu
-        soft: true
-      - name: atmosphere-build-container-image-ubuntu-cloud-archive
-        soft: true
-      - name: atmosphere-build-container-image-python-base
-        soft: true
-      - name: atmosphere-build-container-image-openstack-venv-builder
-        soft: true
-      - name: atmosphere-build-container-image-openstack-python-runtime
-        soft: true
-    vars: &container_image_vars
-      promote_container_image_job: atmosphere-build-container-image-cinder
-      container_images:
-        - context: images/cinder
-          registry: harbor.atmosphere.dev
-          repository: "{{ container_registry }}/cinder"
-          arch:
-            - linux/amd64
-          build_args:
-            - REGISTRY={{ container_registry }}
-            - "RELEASE={{ zuul.branch | replace('stable/', '') }}"
-            - PROJECT=cinder
-          tags:
-            - "{{ zuul.branch | replace('stable/', '') }}"
-    files: &container_image_files
-      - images/ubuntu/.*
-      - images/ubuntu-cloud-archive/.*
-      - images/python-base/.*
-      - images/openstack-venv-builder/.*
-      - images/openstack-python-runtime/.*
-      - images/cinder/.*
-
-- job:
-    name: atmosphere-promote-container-image-cinder
-    parent: atmosphere-promote-container-image
-    vars: *container_image_vars
-    files: *container_image_files
diff --git a/zuul.d/container-images/designate.yaml b/zuul.d/container-images/designate.yaml
deleted file mode 100644
index 1f4b19b..0000000
--- a/zuul.d/container-images/designate.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright (c) 2024 VEXXHOST, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-- project:
-    check:
-      jobs:
-        - atmosphere-build-container-image-designate
-    gate:
-      jobs:
-        - atmosphere-build-container-image-designate
-    promote:
-      jobs:
-        - atmosphere-promote-container-image-designate
-
-- job:
-    name: atmosphere-build-container-image-designate
-    parent: atmosphere-build-container-image
-    dependencies:
-      - name: atmosphere-buildset-registry
-        soft: false
-      - name: atmosphere-build-container-image-ubuntu
-        soft: true
-      - name: atmosphere-build-container-image-ubuntu-cloud-archive
-        soft: true
-      - name: atmosphere-build-container-image-python-base
-        soft: true
-      - name: atmosphere-build-container-image-openstack-venv-builder
-        soft: true
-      - name: atmosphere-build-container-image-openstack-python-runtime
-        soft: true
-    vars: &container_image_vars
-      promote_container_image_job: atmosphere-build-container-image-designate
-      container_images:
-        - context: images/designate
-          registry: harbor.atmosphere.dev
-          repository: "{{ container_registry }}/designate"
-          arch:
-            - linux/amd64
-          build_args:
-            - REGISTRY={{ container_registry }}
-            - "RELEASE={{ zuul.branch | replace('stable/', '') }}"
-            - PROJECT=designate
-          tags:
-            - "{{ zuul.branch | replace('stable/', '') }}"
-    files: &container_image_files
-      - images/ubuntu/.*
-      - images/ubuntu-cloud-archive/.*
-      - images/python-base/.*
-      - images/openstack-venv-builder/.*
-      - images/openstack-python-runtime/.*
-      - images/designate/.*
-
-- job:
-    name: atmosphere-promote-container-image-designate
-    parent: atmosphere-promote-container-image
-    vars: *container_image_vars
-    files: *container_image_files
diff --git a/zuul.d/container-images/glance.yaml b/zuul.d/container-images/glance.yaml
deleted file mode 100644
index 5cfc43c..0000000
--- a/zuul.d/container-images/glance.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright (c) 2024 VEXXHOST, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-- project:
-    check:
-      jobs:
-        - atmosphere-build-container-image-glance
-    gate:
-      jobs:
-        - atmosphere-build-container-image-glance
-    promote:
-      jobs:
-        - atmosphere-promote-container-image-glance
-
-- job:
-    name: atmosphere-build-container-image-glance
-    parent: atmosphere-build-container-image
-    dependencies:
-      - name: atmosphere-buildset-registry
-        soft: false
-      - name: atmosphere-build-container-image-ubuntu
-        soft: true
-      - name: atmosphere-build-container-image-ubuntu-cloud-archive
-        soft: true
-      - name: atmosphere-build-container-image-python-base
-        soft: true
-      - name: atmosphere-build-container-image-openstack-venv-builder
-        soft: true
-      - name: atmosphere-build-container-image-openstack-python-runtime
-        soft: true
-    vars: &container_image_vars
-      promote_container_image_job: atmosphere-build-container-image-glance
-      container_images:
-        - context: images/glance
-          registry: harbor.atmosphere.dev
-          repository: "{{ container_registry }}/glance"
-          arch:
-            - linux/amd64
-          build_args:
-            - REGISTRY={{ container_registry }}
-            - "RELEASE={{ zuul.branch | replace('stable/', '') }}"
-            - PROJECT=glance
-          tags:
-            - "{{ zuul.branch | replace('stable/', '') }}"
-    files: &container_image_files
-      - images/ubuntu/.*
-      - images/ubuntu-cloud-archive/.*
-      - images/python-base/.*
-      - images/openstack-venv-builder/.*
-      - images/openstack-python-runtime/.*
-      - images/glance/.*
-
-- job:
-    name: atmosphere-promote-container-image-glance
-    parent: atmosphere-promote-container-image
-    vars: *container_image_vars
-    files: *container_image_files
diff --git a/zuul.d/container-images/heat.yaml b/zuul.d/container-images/heat.yaml
deleted file mode 100644
index c6970eb..0000000
--- a/zuul.d/container-images/heat.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright (c) 2024 VEXXHOST, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-- project:
-    check:
-      jobs:
-        - atmosphere-build-container-image-heat
-    gate:
-      jobs:
-        - atmosphere-build-container-image-heat
-    promote:
-      jobs:
-        - atmosphere-promote-container-image-heat
-
-- job:
-    name: atmosphere-build-container-image-heat
-    parent: atmosphere-build-container-image
-    dependencies:
-      - name: atmosphere-buildset-registry
-        soft: false
-      - name: atmosphere-build-container-image-ubuntu
-        soft: true
-      - name: atmosphere-build-container-image-ubuntu-cloud-archive
-        soft: true
-      - name: atmosphere-build-container-image-python-base
-        soft: true
-      - name: atmosphere-build-container-image-openstack-venv-builder
-        soft: true
-      - name: atmosphere-build-container-image-openstack-python-runtime
-        soft: true
-    vars: &container_image_vars
-      promote_container_image_job: atmosphere-build-container-image-heat
-      container_images:
-        - context: images/heat
-          registry: harbor.atmosphere.dev
-          repository: "{{ container_registry }}/heat"
-          arch:
-            - linux/amd64
-          build_args:
-            - REGISTRY={{ container_registry }}
-            - "RELEASE={{ zuul.branch | replace('stable/', '') }}"
-            - PROJECT=heat
-          tags:
-            - "{{ zuul.branch | replace('stable/', '') }}"
-    files: &container_image_files
-      - images/ubuntu/.*
-      - images/ubuntu-cloud-archive/.*
-      - images/python-base/.*
-      - images/openstack-venv-builder/.*
-      - images/openstack-python-runtime/.*
-      - images/heat/.*
-
-- job:
-    name: atmosphere-promote-container-image-heat
-    parent: atmosphere-promote-container-image
-    vars: *container_image_vars
-    files: *container_image_files
diff --git a/zuul.d/container-images/horizon.yaml b/zuul.d/container-images/horizon.yaml
deleted file mode 100644
index d1f65ad..0000000
--- a/zuul.d/container-images/horizon.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright (c) 2024 VEXXHOST, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-- project:
-    check:
-      jobs:
-        - atmosphere-build-container-image-horizon
-    gate:
-      jobs:
-        - atmosphere-build-container-image-horizon
-    promote:
-      jobs:
-        - atmosphere-promote-container-image-horizon
-
-- job:
-    name: atmosphere-build-container-image-horizon
-    parent: atmosphere-build-container-image
-    dependencies:
-      - name: atmosphere-buildset-registry
-        soft: false
-      - name: atmosphere-build-container-image-ubuntu
-        soft: true
-      - name: atmosphere-build-container-image-ubuntu-cloud-archive
-        soft: true
-      - name: atmosphere-build-container-image-python-base
-        soft: true
-      - name: atmosphere-build-container-image-openstack-venv-builder
-        soft: true
-      - name: atmosphere-build-container-image-openstack-python-runtime
-        soft: true
-    vars: &container_image_vars
-      promote_container_image_job: atmosphere-build-container-image-horizon
-      container_images:
-        - context: images/horizon
-          registry: harbor.atmosphere.dev
-          repository: "{{ container_registry }}/horizon"
-          arch:
-            - linux/amd64
-          build_args:
-            - REGISTRY={{ container_registry }}
-            - "RELEASE={{ zuul.branch | replace('stable/', '') }}"
-            - PROJECT=horizon
-          tags:
-            - "{{ zuul.branch | replace('stable/', '') }}"
-    files: &container_image_files
-      - images/ubuntu/.*
-      - images/ubuntu-cloud-archive/.*
-      - images/python-base/.*
-      - images/openstack-venv-builder/.*
-      - images/openstack-python-runtime/.*
-      - images/horizon/.*
-
-- job:
-    name: atmosphere-promote-container-image-horizon
-    parent: atmosphere-promote-container-image
-    vars: *container_image_vars
-    files: *container_image_files
diff --git a/zuul.d/container-images/ironic.yaml b/zuul.d/container-images/ironic.yaml
deleted file mode 100644
index 0a93e62..0000000
--- a/zuul.d/container-images/ironic.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright (c) 2024 VEXXHOST, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-- project:
-    check:
-      jobs:
-        - atmosphere-build-container-image-ironic
-    gate:
-      jobs:
-        - atmosphere-build-container-image-ironic
-    promote:
-      jobs:
-        - atmosphere-promote-container-image-ironic
-
-- job:
-    name: atmosphere-build-container-image-ironic
-    parent: atmosphere-build-container-image
-    dependencies:
-      - name: atmosphere-buildset-registry
-        soft: false
-      - name: atmosphere-build-container-image-ubuntu
-        soft: true
-      - name: atmosphere-build-container-image-ubuntu-cloud-archive
-        soft: true
-      - name: atmosphere-build-container-image-python-base
-        soft: true
-      - name: atmosphere-build-container-image-openstack-venv-builder
-        soft: true
-      - name: atmosphere-build-container-image-openstack-python-runtime
-        soft: true
-    vars: &container_image_vars
-      promote_container_image_job: atmosphere-build-container-image-ironic
-      container_images:
-        - context: images/ironic
-          registry: harbor.atmosphere.dev
-          repository: "{{ container_registry }}/ironic"
-          arch:
-            - linux/amd64
-          build_args:
-            - REGISTRY={{ container_registry }}
-            - "RELEASE={{ zuul.branch | replace('stable/', '') }}"
-            - PROJECT=ironic
-          tags:
-            - "{{ zuul.branch | replace('stable/', '') }}"
-    files: &container_image_files
-      - images/ubuntu/.*
-      - images/ubuntu-cloud-archive/.*
-      - images/python-base/.*
-      - images/openstack-venv-builder/.*
-      - images/openstack-python-runtime/.*
-      - images/ironic/.*
-
-- job:
-    name: atmosphere-promote-container-image-ironic
-    parent: atmosphere-promote-container-image
-    vars: *container_image_vars
-    files: *container_image_files
diff --git a/zuul.d/container-images/keepalived.yaml b/zuul.d/container-images/keepalived.yaml
deleted file mode 100644
index 28677be..0000000
--- a/zuul.d/container-images/keepalived.yaml
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright (c) 2024 VEXXHOST, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-- project:
-    check:
-      jobs:
-        - atmosphere-build-container-image-keepalived
-    gate:
-      jobs:
-        - atmosphere-build-container-image-keepalived
-    promote:
-      jobs:
-        - atmosphere-promote-container-image-keepalived
-
-- job:
-    name: atmosphere-build-container-image-keepalived
-    parent: atmosphere-build-container-image
-    dependencies:
-      - name: atmosphere-buildset-registry
-        soft: false
-      - name: atmosphere-build-container-image-ubuntu
-        soft: true
-    vars: &container_image_vars
-      promote_container_image_job: atmosphere-build-container-image-keepalived
-      container_images:
-        - context: images/keepalived
-          registry: harbor.atmosphere.dev
-          repository: "{{ container_registry }}/keepalived"
-          arch:
-            - linux/amd64
-          build_args:
-            - REGISTRY={{ container_registry }}
-            - "RELEASE={{ zuul.branch | replace('stable/', '') }}"
-          tags:
-            - "{{ zuul.branch | replace('stable/', '') }}"
-    files: &container_image_files
-      - images/ubuntu/.*
-      - images/keepalived/.*
-
-- job:
-    name: atmosphere-promote-container-image-keepalived
-    parent: atmosphere-promote-container-image
-    vars: *container_image_vars
-    files: *container_image_files
diff --git a/zuul.d/container-images/keystone.yaml b/zuul.d/container-images/keystone.yaml
deleted file mode 100644
index 555a980..0000000
--- a/zuul.d/container-images/keystone.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright (c) 2024 VEXXHOST, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-- project:
-    check:
-      jobs:
-        - atmosphere-build-container-image-keystone
-    gate:
-      jobs:
-        - atmosphere-build-container-image-keystone
-    promote:
-      jobs:
-        - atmosphere-promote-container-image-keystone
-
-- job:
-    name: atmosphere-build-container-image-keystone
-    parent: atmosphere-build-container-image
-    dependencies:
-      - name: atmosphere-buildset-registry
-        soft: false
-      - name: atmosphere-build-container-image-ubuntu
-        soft: true
-      - name: atmosphere-build-container-image-ubuntu-cloud-archive
-        soft: true
-      - name: atmosphere-build-container-image-python-base
-        soft: true
-      - name: atmosphere-build-container-image-openstack-venv-builder
-        soft: true
-      - name: atmosphere-build-container-image-openstack-python-runtime
-        soft: true
-    vars: &container_image_vars
-      promote_container_image_job: atmosphere-build-container-image-keystone
-      container_images:
-        - context: images/keystone
-          registry: harbor.atmosphere.dev
-          repository: "{{ container_registry }}/keystone"
-          arch:
-            - linux/amd64
-          build_args:
-            - REGISTRY={{ container_registry }}
-            - "RELEASE={{ zuul.branch | replace('stable/', '') }}"
-            - PROJECT=keystone
-          tags:
-            - "{{ zuul.branch | replace('stable/', '') }}"
-    files: &container_image_files
-      - images/ubuntu/.*
-      - images/ubuntu-cloud-archive/.*
-      - images/python-base/.*
-      - images/openstack-venv-builder/.*
-      - images/openstack-python-runtime/.*
-      - images/keystone/.*
-
-- job:
-    name: atmosphere-promote-container-image-keystone
-    parent: atmosphere-promote-container-image
-    vars: *container_image_vars
-    files: *container_image_files
diff --git a/zuul.d/container-images/kubernetes-entrypoint.yaml b/zuul.d/container-images/kubernetes-entrypoint.yaml
deleted file mode 100644
index 593e1ca..0000000
--- a/zuul.d/container-images/kubernetes-entrypoint.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright (c) 2024 VEXXHOST, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-- project:
-    check:
-      jobs:
-        - atmosphere-build-container-image-kubernetes-entrypoint
-    gate:
-      jobs:
-        - atmosphere-build-container-image-kubernetes-entrypoint
-    promote:
-      jobs:
-        - atmosphere-promote-container-image-kubernetes-entrypoint
-
-- job:
-    name: atmosphere-build-container-image-kubernetes-entrypoint
-    parent: atmosphere-build-container-image
-    dependencies:
-      - name: atmosphere-buildset-registry
-        soft: false
-    vars: &container_image_vars
-      promote_container_image_job: atmosphere-build-container-image-kubernetes-entrypoint
-      container_images:
-        - context: images/kubernetes-entrypoint
-          registry: harbor.atmosphere.dev
-          repository: "{{ container_registry }}/kubernetes-entrypoint"
-          arch:
-            - linux/amd64
-            - linux/arm64
-          tags:
-            - "{{ zuul.branch | replace('stable/', '') }}"
-    files: &container_image_files
-      - images/kubernetes-entrypoint/.*
-
-- job:
-    name: atmosphere-promote-container-image-kubernetes-entrypoint
-    parent: atmosphere-promote-container-image
-    vars: *container_image_vars
-    files: *container_image_files
diff --git a/zuul.d/container-images/libvirtd.yaml b/zuul.d/container-images/libvirtd.yaml
deleted file mode 100644
index ac0e1ba..0000000
--- a/zuul.d/container-images/libvirtd.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright (c) 2024 VEXXHOST, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-- project:
-    check:
-      jobs:
-        - atmosphere-build-container-image-libvirtd
-    gate:
-      jobs:
-        - atmosphere-build-container-image-libvirtd
-    promote:
-      jobs:
-        - atmosphere-promote-container-image-libvirtd
-
-- job:
-    name: atmosphere-build-container-image-libvirtd
-    parent: atmosphere-build-container-image
-    dependencies:
-      - name: atmosphere-buildset-registry
-        soft: false
-      - name: atmosphere-build-container-image-ubuntu
-        soft: true
-      - name: atmosphere-build-container-image-ubuntu-cloud-archive
-        soft: true
-      - name: atmosphere-build-container-image-openstack-runtime
-        soft: true
-    vars: &container_image_vars
-      promote_container_image_job: atmosphere-build-container-image-libvirtd
-      container_images:
-        - context: images/libvirtd
-          registry: harbor.atmosphere.dev
-          repository: "{{ container_registry }}/libvirtd"
-          arch:
-            - linux/amd64
-            - linux/arm64
-          build_args:
-            - REGISTRY={{ container_registry }}
-            - "RELEASE={{ zuul.branch | replace('stable/', '') }}"
-            - PROJECT=nova
-          tags:
-            - "{{ zuul.branch | replace('stable/', '') }}"
-    files: &container_image_files
-      - images/ubuntu/.*
-      - images/ubuntu-cloud-archive/.*
-      - images/openstack-runtime/.*
-      - images/libvirtd/.*
-
-- job:
-    name: atmosphere-promote-container-image-libvirtd
-    parent: atmosphere-promote-container-image
-    vars: *container_image_vars
-    files: *container_image_files
diff --git a/zuul.d/container-images/magnum.yaml b/zuul.d/container-images/magnum.yaml
deleted file mode 100644
index 34f400e..0000000
--- a/zuul.d/container-images/magnum.yaml
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright (c) 2024 VEXXHOST, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-- project:
-    check:
-      jobs:
-        - atmosphere-build-container-image-magnum
-    gate:
-      jobs:
-        - atmosphere-build-container-image-magnum
-    promote:
-      jobs:
-        - atmosphere-promote-container-image-magnum
-
-- job:
-    name: atmosphere-build-container-image-magnum
-    parent: atmosphere-build-container-image
-    dependencies:
-      - name: atmosphere-buildset-registry
-        soft: false
-      - name: atmosphere-build-container-image-ubuntu
-        soft: true
-      - name: atmosphere-build-container-image-ubuntu-cloud-archive
-        soft: true
-      - name: atmosphere-build-container-image-python-base
-        soft: true
-      - name: atmosphere-build-container-image-openstack-venv-builder
-        soft: true
-      - name: atmosphere-build-container-image-openstack-python-runtime
-        soft: true
-    vars: &container_image_vars
-      promote_container_image_job: atmosphere-build-container-image-magnum
-      container_images:
-        - context: images/magnum
-          registry: harbor.atmosphere.dev
-          repository: "{{ container_registry }}/magnum"
-          arch:
-            - linux/amd64
-            - linux/arm64
-          build_args:
-            - REGISTRY={{ container_registry }}
-            - "RELEASE={{ zuul.branch | replace('stable/', '') }}"
-            - PROJECT=magnum
-          tags:
-            - "{{ zuul.branch | replace('stable/', '') }}"
-    files: &container_image_files
-      - images/ubuntu/.*
-      - images/ubuntu-cloud-archive/.*
-      - images/python-base/.*
-      - images/openstack-venv-builder/.*
-      - images/openstack-python-runtime/.*
-      - images/magnum/.*
-
-- job:
-    name: atmosphere-promote-container-image-magnum
-    parent: atmosphere-promote-container-image
-    vars: *container_image_vars
-    files: *container_image_files
diff --git a/zuul.d/container-images/manila.yaml b/zuul.d/container-images/manila.yaml
deleted file mode 100644
index 7ce412c..0000000
--- a/zuul.d/container-images/manila.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright (c) 2024 VEXXHOST, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-- project:
-    check:
-      jobs:
-        - atmosphere-build-container-image-manila
-    gate:
-      jobs:
-        - atmosphere-build-container-image-manila
-    promote:
-      jobs:
-        - atmosphere-promote-container-image-manila
-
-- job:
-    name: atmosphere-build-container-image-manila
-    parent: atmosphere-build-container-image
-    dependencies:
-      - name: atmosphere-buildset-registry
-        soft: false
-      - name: atmosphere-build-container-image-ubuntu
-        soft: true
-      - name: atmosphere-build-container-image-ubuntu-cloud-archive
-        soft: true
-      - name: atmosphere-build-container-image-python-base
-        soft: true
-      - name: atmosphere-build-container-image-openstack-venv-builder
-        soft: true
-      - name: atmosphere-build-container-image-openstack-python-runtime
-        soft: true
-    vars: &container_image_vars
-      promote_container_image_job: atmosphere-build-container-image-manila
-      container_images:
-        - context: images/manila
-          registry: harbor.atmosphere.dev
-          repository: "{{ container_registry }}/manila"
-          arch:
-            - linux/amd64
-          build_args:
-            - REGISTRY={{ container_registry }}
-            - "RELEASE={{ zuul.branch | replace('stable/', '') }}"
-            - PROJECT=manila
-          tags:
-            - "{{ zuul.branch | replace('stable/', '') }}"
-    files: &container_image_files
-      - images/ubuntu/.*
-      - images/ubuntu-cloud-archive/.*
-      - images/python-base/.*
-      - images/openstack-venv-builder/.*
-      - images/openstack-python-runtime/.*
-      - images/manila/.*
-
-- job:
-    name: atmosphere-promote-container-image-manila
-    parent: atmosphere-promote-container-image
-    vars: *container_image_vars
-    files: *container_image_files
diff --git a/zuul.d/container-images/netoffload.yaml b/zuul.d/container-images/netoffload.yaml
deleted file mode 100644
index 7236c12..0000000
--- a/zuul.d/container-images/netoffload.yaml
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright (c) 2024 VEXXHOST, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-- project:
-    check:
-      jobs:
-        - atmosphere-build-container-image-netoffload
-    gate:
-      jobs:
-        - atmosphere-build-container-image-netoffload
-    promote:
-      jobs:
-        - atmosphere-promote-container-image-netoffload
-
-- job:
-    name: atmosphere-build-container-image-netoffload
-    parent: atmosphere-build-container-image
-    dependencies:
-      - name: atmosphere-buildset-registry
-        soft: false
-      - name: atmosphere-build-container-image-ubuntu
-        soft: true
-    vars: &container_image_vars
-      promote_container_image_job: atmosphere-build-container-image-netoffload
-      container_images:
-        - context: images/netoffload
-          registry: harbor.atmosphere.dev
-          repository: "{{ container_registry }}/netoffload"
-          arch:
-            - linux/amd64
-          build_args:
-            - REGISTRY={{ container_registry }}
-            - "RELEASE={{ zuul.branch | replace('stable/', '') }}"
-          tags:
-            - "{{ zuul.branch | replace('stable/', '') }}"
-    files: &container_image_files
-      - images/ubuntu/.*
-      - images/netoffload/.*
-
-- job:
-    name: atmosphere-promote-container-image-netoffload
-    parent: atmosphere-promote-container-image
-    vars: *container_image_vars
-    files: *container_image_files
diff --git a/zuul.d/container-images/neutron.yaml b/zuul.d/container-images/neutron.yaml
deleted file mode 100644
index ee2113a..0000000
--- a/zuul.d/container-images/neutron.yaml
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright (c) 2024 VEXXHOST, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-- project:
-    check:
-      jobs:
-        - atmosphere-build-container-image-neutron
-    gate:
-      jobs:
-        - atmosphere-build-container-image-neutron
-    promote:
-      jobs:
-        - atmosphere-promote-container-image-neutron
-
-- job:
-    name: atmosphere-build-container-image-neutron
-    parent: atmosphere-build-container-image
-    dependencies:
-      - name: atmosphere-buildset-registry
-        soft: false
-      - name: atmosphere-build-container-image-ubuntu
-        soft: true
-      - name: atmosphere-build-container-image-ubuntu-cloud-archive
-        soft: true
-      - name: atmosphere-build-container-image-python-base
-        soft: true
-      - name: atmosphere-build-container-image-openstack-venv-builder
-        soft: true
-      - name: atmosphere-build-container-image-openstack-python-runtime
-        soft: true
-    vars: &container_image_vars
-      promote_container_image_job: atmosphere-build-container-image-neutron
-      container_images:
-        - context: images/neutron
-          registry: harbor.atmosphere.dev
-          repository: "{{ container_registry }}/neutron"
-          arch:
-            - linux/amd64
-            - linux/arm64
-          build_args:
-            - REGISTRY={{ container_registry }}
-            - "RELEASE={{ zuul.branch | replace('stable/', '') }}"
-            - PROJECT=neutron
-          tags:
-            - "{{ zuul.branch | replace('stable/', '') }}"
-    files: &container_image_files
-      - images/ubuntu/.*
-      - images/ubuntu-cloud-archive/.*
-      - images/python-base/.*
-      - images/openstack-venv-builder/.*
-      - images/openstack-python-runtime/.*
-      - images/neutron/.*
-
-- job:
-    name: atmosphere-promote-container-image-neutron
-    parent: atmosphere-promote-container-image
-    vars: *container_image_vars
-    files: *container_image_files
diff --git a/zuul.d/container-images/nova-ssh.yaml b/zuul.d/container-images/nova-ssh.yaml
deleted file mode 100644
index e60df3e..0000000
--- a/zuul.d/container-images/nova-ssh.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright (c) 2024 VEXXHOST, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-- project:
-    check:
-      jobs:
-        - atmosphere-build-container-image-nova-ssh
-    gate:
-      jobs:
-        - atmosphere-build-container-image-nova-ssh
-    promote:
-      jobs:
-        - atmosphere-promote-container-image-nova-ssh
-
-- job:
-    name: atmosphere-build-container-image-nova-ssh
-    parent: atmosphere-build-container-image
-    dependencies:
-      - name: atmosphere-buildset-registry
-        soft: false
-      - name: atmosphere-build-container-image-ubuntu
-        soft: true
-      - name: atmosphere-build-container-image-ubuntu-cloud-archive
-        soft: true
-      - name: atmosphere-build-container-image-openstack-runtime
-        soft: true
-    vars: &container_image_vars
-      promote_container_image_job: atmosphere-build-container-image-nova-ssh
-      container_images:
-        - context: images/nova-ssh
-          registry: harbor.atmosphere.dev
-          repository: "{{ container_registry }}/nova-ssh"
-          arch:
-            - linux/amd64
-            - linux/arm64
-          build_args:
-            - REGISTRY={{ container_registry }}
-            - "RELEASE={{ zuul.branch | replace('stable/', '') }}"
-            - PROJECT=nova
-            - SHELL=/bin/bash
-          tags:
-            - "{{ zuul.branch | replace('stable/', '') }}"
-    files: &container_image_files
-      - images/ubuntu/.*
-      - images/ubuntu-cloud-archive/.*
-      - images/openstack-runtime/.*
-      - images/nova-ssh/.*
-
-- job:
-    name: atmosphere-promote-container-image-nova-ssh
-    parent: atmosphere-promote-container-image
-    vars: *container_image_vars
-    files: *container_image_files
diff --git a/zuul.d/container-images/nova.yaml b/zuul.d/container-images/nova.yaml
deleted file mode 100644
index eca6875..0000000
--- a/zuul.d/container-images/nova.yaml
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright (c) 2024 VEXXHOST, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-- project:
-    check:
-      jobs:
-        - atmosphere-build-container-image-nova
-    gate:
-      jobs:
-        - atmosphere-build-container-image-nova
-    promote:
-      jobs:
-        - atmosphere-promote-container-image-nova
-
-- job:
-    name: atmosphere-build-container-image-nova
-    parent: atmosphere-build-container-image
-    dependencies:
-      - name: atmosphere-buildset-registry
-        soft: false
-      - name: atmosphere-build-container-image-ubuntu
-        soft: true
-      - name: atmosphere-build-container-image-ubuntu-cloud-archive
-        soft: true
-      - name: atmosphere-build-container-image-python-base
-        soft: true
-      - name: atmosphere-build-container-image-openstack-venv-builder
-        soft: true
-      - name: atmosphere-build-container-image-openstack-python-runtime
-        soft: true
-    vars: &container_image_vars
-      promote_container_image_job: atmosphere-build-container-image-nova
-      container_images:
-        - context: images/nova
-          registry: harbor.atmosphere.dev
-          repository: "{{ container_registry }}/nova"
-          arch:
-            - linux/amd64
-            - linux/arm64
-          build_args:
-            - REGISTRY={{ container_registry }}
-            - "RELEASE={{ zuul.branch | replace('stable/', '') }}"
-            - PROJECT=nova
-            - SHELL=/bin/bash
-          tags:
-            - "{{ zuul.branch | replace('stable/', '') }}"
-    files: &container_image_files
-      - images/ubuntu/.*
-      - images/ubuntu-cloud-archive/.*
-      - images/python-base/.*
-      - images/openstack-venv-builder/.*
-      - images/openstack-python-runtime/.*
-      - images/nova/.*
-
-- job:
-    name: atmosphere-promote-container-image-nova
-    parent: atmosphere-promote-container-image
-    vars: *container_image_vars
-    files: *container_image_files
diff --git a/zuul.d/container-images/octavia.yaml b/zuul.d/container-images/octavia.yaml
deleted file mode 100644
index 5089cd9..0000000
--- a/zuul.d/container-images/octavia.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright (c) 2024 VEXXHOST, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-- project:
-    check:
-      jobs:
-        - atmosphere-build-container-image-octavia
-    gate:
-      jobs:
-        - atmosphere-build-container-image-octavia
-    promote:
-      jobs:
-        - atmosphere-promote-container-image-octavia
-
-- job:
-    name: atmosphere-build-container-image-octavia
-    parent: atmosphere-build-container-image
-    dependencies:
-      - name: atmosphere-buildset-registry
-        soft: false
-      - name: atmosphere-build-container-image-ubuntu
-        soft: true
-      - name: atmosphere-build-container-image-ubuntu-cloud-archive
-        soft: true
-      - name: atmosphere-build-container-image-python-base
-        soft: true
-      - name: atmosphere-build-container-image-openstack-venv-builder
-        soft: true
-      - name: atmosphere-build-container-image-openstack-python-runtime
-        soft: true
-    vars: &container_image_vars
-      promote_container_image_job: atmosphere-build-container-image-octavia
-      container_images:
-        - context: images/octavia
-          registry: harbor.atmosphere.dev
-          repository: "{{ container_registry }}/octavia"
-          arch:
-            - linux/amd64
-          build_args:
-            - REGISTRY={{ container_registry }}
-            - "RELEASE={{ zuul.branch | replace('stable/', '') }}"
-            - PROJECT=octavia
-          tags:
-            - "{{ zuul.branch | replace('stable/', '') }}"
-    files: &container_image_files
-      - images/ubuntu/.*
-      - images/ubuntu-cloud-archive/.*
-      - images/python-base/.*
-      - images/openstack-venv-builder/.*
-      - images/openstack-python-runtime/.*
-      - images/octavia/.*
-
-- job:
-    name: atmosphere-promote-container-image-octavia
-    parent: atmosphere-promote-container-image
-    vars: *container_image_vars
-    files: *container_image_files
diff --git a/zuul.d/container-images/openstack-python-runtime.yaml b/zuul.d/container-images/openstack-python-runtime.yaml
deleted file mode 100644
index 7d4302b..0000000
--- a/zuul.d/container-images/openstack-python-runtime.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright (c) 2024 VEXXHOST, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-- project:
-    check:
-      jobs:
-        - atmosphere-build-container-image-openstack-python-runtime
-    gate:
-      jobs:
-        - atmosphere-build-container-image-openstack-python-runtime
-    promote:
-      jobs:
-        - atmosphere-promote-container-image-openstack-python-runtime
-
-- job:
-    name: atmosphere-build-container-image-openstack-python-runtime
-    parent: atmosphere-build-container-image
-    dependencies:
-      - name: atmosphere-buildset-registry
-        soft: false
-      - name: atmosphere-build-container-image-ubuntu
-        soft: true
-      - name: atmosphere-build-container-image-ubuntu-cloud-archive
-        soft: true
-      - name: atmosphere-build-container-image-python-base
-        soft: true
-    vars: &container_image_vars
-      promote_container_image_job: atmosphere-build-container-image-openstack-python-runtime
-      container_images:
-        - context: images/openstack-runtime
-          registry: harbor.atmosphere.dev
-          repository: "{{ container_registry }}/openstack-python-runtime"
-          arch:
-            - linux/amd64
-            - linux/arm64
-          build_args:
-            - REGISTRY={{ container_registry }}
-            - "RELEASE={{ zuul.branch | replace('stable/', '') }}"
-            - "FROM={{ container_registry }}/python-base:{{ zuul.branch | replace('stable/', '') }}"
-          tags:
-            - "{{ zuul.branch | replace('stable/', '') }}"
-    files: &container_image_files
-      - images/ubuntu/.*
-      - images/ubuntu-cloud-archive/.*
-      - images/python-base/.*
-      - images/openstack-runtime/.*
-
-- job:
-    name: atmosphere-promote-container-image-openstack-python-runtime
-    parent: atmosphere-promote-container-image
-    vars: *container_image_vars
-    files: *container_image_files
diff --git a/zuul.d/container-images/openstack-runtime.yaml b/zuul.d/container-images/openstack-runtime.yaml
deleted file mode 100644
index 21b0de0..0000000
--- a/zuul.d/container-images/openstack-runtime.yaml
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright (c) 2024 VEXXHOST, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-- project:
-    check:
-      jobs:
-        - atmosphere-build-container-image-openstack-runtime
-    gate:
-      jobs:
-        - atmosphere-build-container-image-openstack-runtime
-    promote:
-      jobs:
-        - atmosphere-promote-container-image-openstack-runtime
-
-- job:
-    name: atmosphere-build-container-image-openstack-runtime
-    parent: atmosphere-build-container-image
-    dependencies:
-      - name: atmosphere-buildset-registry
-        soft: false
-      - name: atmosphere-build-container-image-ubuntu
-        soft: true
-      - name: atmosphere-build-container-image-ubuntu-cloud-archive
-        soft: true
-    vars: &container_image_vars
-      promote_container_image_job: atmosphere-build-container-image-openstack-runtime
-      container_images:
-        - context: images/openstack-runtime
-          registry: harbor.atmosphere.dev
-          repository: "{{ container_registry }}/openstack-runtime"
-          arch:
-            - linux/amd64
-            - linux/arm64
-          build_args:
-            - REGISTRY={{ container_registry }}
-            - "RELEASE={{ zuul.branch | replace('stable/', '') }}"
-          tags:
-            - "{{ zuul.branch | replace('stable/', '') }}"
-    files: &container_image_files
-      - images/ubuntu/.*
-      - images/ubuntu-cloud-archive/.*
-      - images/openstack-runtime/.*
-
-- job:
-    name: atmosphere-promote-container-image-openstack-runtime
-    parent: atmosphere-promote-container-image
-    vars: *container_image_vars
-    files: *container_image_files
diff --git a/zuul.d/container-images/openstack-venv-builder.yaml b/zuul.d/container-images/openstack-venv-builder.yaml
deleted file mode 100644
index 68bae33..0000000
--- a/zuul.d/container-images/openstack-venv-builder.yaml
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright (c) 2024 VEXXHOST, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-- project:
-    check:
-      jobs:
-        - atmosphere-build-container-image-openstack-venv-builder
-    gate:
-      jobs:
-        - atmosphere-build-container-image-openstack-venv-builder
-    promote:
-      jobs:
-        - atmosphere-promote-container-image-openstack-venv-builder
-
-- job:
-    name: atmosphere-build-container-image-openstack-venv-builder
-    parent: atmosphere-build-container-image
-    dependencies:
-      - name: atmosphere-buildset-registry
-        soft: false
-      - name: atmosphere-build-container-image-ubuntu
-        soft: true
-      - name: atmosphere-build-container-image-ubuntu-cloud-archive
-        soft: true
-      - name: atmosphere-build-container-image-python-base
-        soft: true
-    vars: &container_image_vars
-      promote_container_image_job: atmosphere-build-container-image-openstack-venv-builder
-      container_images:
-        - context: images/openstack-venv-builder
-          registry: harbor.atmosphere.dev
-          repository: "{{ container_registry }}/openstack-venv-builder"
-          arch:
-            - linux/amd64
-            - linux/arm64
-          build_args:
-            - REGISTRY={{ container_registry }}
-            - "RELEASE={{ zuul.branch | replace('stable/', '') }}"
-          tags:
-            - "{{ zuul.branch | replace('stable/', '') }}"
-    files: &container_image_files
-      - images/ubuntu/.*
-      - images/ubuntu-cloud-archive/.*
-      - images/python-base/.*
-      - images/openstack-venv-builder/.*
-
-- job:
-    name: atmosphere-promote-container-image-openstack-venv-builder
-    parent: atmosphere-promote-container-image
-    vars: *container_image_vars
-    files: *container_image_files
diff --git a/zuul.d/container-images/openvswitch.yaml b/zuul.d/container-images/openvswitch.yaml
deleted file mode 100644
index 0d8edfd..0000000
--- a/zuul.d/container-images/openvswitch.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright (c) 2024 VEXXHOST, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-- project:
-    check:
-      jobs:
-        - atmosphere-build-container-image-openvswitch
-    gate:
-      jobs:
-        - atmosphere-build-container-image-openvswitch
-    promote:
-      jobs:
-        - atmosphere-promote-container-image-openvswitch
-
-- job:
-    name: atmosphere-build-container-image-openvswitch
-    parent: atmosphere-build-container-image
-    dependencies:
-      - name: atmosphere-buildset-registry
-        soft: false
-    vars: &container_image_vars
-      promote_container_image_job: atmosphere-build-container-image-openvswitch
-      container_images:
-        - context: images/openvswitch
-          registry: harbor.atmosphere.dev
-          repository: "{{ container_registry }}/openvswitch"
-          arch:
-            - linux/amd64
-            - linux/arm64
-          tags:
-            - "{{ zuul.branch | replace('stable/', '') }}"
-    files: &container_image_files
-      - images/openvswitch/.*
-
-- job:
-    name: atmosphere-promote-container-image-openvswitch
-    parent: atmosphere-promote-container-image
-    vars: *container_image_vars
-    files: *container_image_files
diff --git a/zuul.d/container-images/ovn.yaml b/zuul.d/container-images/ovn.yaml
deleted file mode 100644
index 882b0d5..0000000
--- a/zuul.d/container-images/ovn.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright (c) 2024 VEXXHOST, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-- project:
-    check:
-      jobs:
-        - atmosphere-build-container-image-ovn
-    gate:
-      jobs:
-        - atmosphere-build-container-image-ovn
-    promote:
-      jobs:
-        - atmosphere-promote-container-image-ovn
-
-- job:
-    name: atmosphere-build-container-image-ovn
-    parent: atmosphere-build-container-image
-    dependencies:
-      - name: atmosphere-buildset-registry
-        soft: false
-      - name: atmosphere-build-container-image-openvswitch
-        soft: true
-    vars: &container_image_vars
-      promote_container_image_job: atmosphere-build-container-image-ovn
-      container_images:
-        - context: images/ovn
-          registry: harbor.atmosphere.dev
-          repository: "{{ container_registry }}/ovn-central"
-          arch:
-            - linux/amd64
-          build_args:
-            - REGISTRY={{ container_registry }}
-            - "RELEASE={{ zuul.branch | replace('stable/', '') }}"
-            - OVN_COMPONENT=central
-          tags:
-            - "{{ zuul.branch | replace('stable/', '') }}"
-        - context: images/ovn
-          registry: harbor.atmosphere.dev
-          repository: "{{ container_registry }}/ovn-host"
-          arch:
-            - linux/amd64
-            - linux/arm64
-          build_args:
-            - REGISTRY={{ container_registry }}
-            - "RELEASE={{ zuul.branch | replace('stable/', '') }}"
-            - OVN_COMPONENT=host
-          tags:
-            - "{{ zuul.branch | replace('stable/', '') }}"
-    files: &container_image_files
-      - images/openvswitch/.*
-      - images/ovn/.*
-
-- job:
-    name: atmosphere-promote-container-image-ovn
-    parent: atmosphere-promote-container-image
-    vars: *container_image_vars
-    files: *container_image_files
diff --git a/zuul.d/container-images/placement.yaml b/zuul.d/container-images/placement.yaml
deleted file mode 100644
index fe491d4..0000000
--- a/zuul.d/container-images/placement.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright (c) 2024 VEXXHOST, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-- project:
-    check:
-      jobs:
-        - atmosphere-build-container-image-placement
-    gate:
-      jobs:
-        - atmosphere-build-container-image-placement
-    promote:
-      jobs:
-        - atmosphere-promote-container-image-placement
-
-- job:
-    name: atmosphere-build-container-image-placement
-    parent: atmosphere-build-container-image
-    dependencies:
-      - name: atmosphere-buildset-registry
-        soft: false
-      - name: atmosphere-build-container-image-ubuntu
-        soft: true
-      - name: atmosphere-build-container-image-ubuntu-cloud-archive
-        soft: true
-      - name: atmosphere-build-container-image-python-base
-        soft: true
-      - name: atmosphere-build-container-image-openstack-venv-builder
-        soft: true
-      - name: atmosphere-build-container-image-openstack-python-runtime
-        soft: true
-    vars: &container_image_vars
-      promote_container_image_job: atmosphere-build-container-image-placement
-      container_images:
-        - context: images/placement
-          registry: harbor.atmosphere.dev
-          repository: "{{ container_registry }}/placement"
-          arch:
-            - linux/amd64
-          build_args:
-            - REGISTRY={{ container_registry }}
-            - "RELEASE={{ zuul.branch | replace('stable/', '') }}"
-            - PROJECT=placement
-          tags:
-            - "{{ zuul.branch | replace('stable/', '') }}"
-    files: &container_image_files
-      - images/ubuntu/.*
-      - images/ubuntu-cloud-archive/.*
-      - images/python-base/.*
-      - images/openstack-venv-builder/.*
-      - images/openstack-python-runtime/.*
-      - images/placement/.*
-
-- job:
-    name: atmosphere-promote-container-image-placement
-    parent: atmosphere-promote-container-image
-    vars: *container_image_vars
-    files: *container_image_files
diff --git a/zuul.d/container-images/python-base.yaml b/zuul.d/container-images/python-base.yaml
deleted file mode 100644
index 2b2bb0a..0000000
--- a/zuul.d/container-images/python-base.yaml
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright (c) 2024 VEXXHOST, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-- project:
-    check:
-      jobs:
-        - atmosphere-build-container-image-python-base
-    gate:
-      jobs:
-        - atmosphere-build-container-image-python-base
-    promote:
-      jobs:
-        - atmosphere-promote-container-image-python-base
-
-- job:
-    name: atmosphere-build-container-image-python-base
-    parent: atmosphere-build-container-image
-    dependencies:
-      - name: atmosphere-buildset-registry
-        soft: false
-      - name: atmosphere-build-container-image-ubuntu
-        soft: true
-      - name: atmosphere-build-container-image-ubuntu-cloud-archive
-        soft: true
-    vars: &container_image_vars
-      promote_container_image_job: atmosphere-build-container-image-python-base
-      container_images:
-        - context: images/python-base
-          registry: harbor.atmosphere.dev
-          repository: "{{ container_registry }}/python-base"
-          arch:
-            - linux/amd64
-            - linux/arm64
-          build_args:
-            - REGISTRY={{ container_registry }}
-            - "RELEASE={{ zuul.branch | replace('stable/', '') }}"
-          tags:
-            - "{{ zuul.branch | replace('stable/', '') }}"
-    files: &container_image_files
-      - images/ubuntu/.*
-      - images/ubuntu-cloud-archive/.*
-      - images/python-base/.*
-
-- job:
-    name: atmosphere-promote-container-image-python-base
-    parent: atmosphere-promote-container-image
-    vars: *container_image_vars
-    files: *container_image_files
diff --git a/zuul.d/container-images/python-openstackclient.yaml b/zuul.d/container-images/python-openstackclient.yaml
deleted file mode 100644
index 435bcfb..0000000
--- a/zuul.d/container-images/python-openstackclient.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright (c) 2024 VEXXHOST, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-- project:
-    check:
-      jobs:
-        - atmosphere-build-container-image-python-openstackclient
-    gate:
-      jobs:
-        - atmosphere-build-container-image-python-openstackclient
-    promote:
-      jobs:
-        - atmosphere-promote-container-image-python-openstackclient
-
-- job:
-    name: atmosphere-build-container-image-python-openstackclient
-    parent: atmosphere-build-container-image
-    dependencies:
-      - name: atmosphere-buildset-registry
-        soft: false
-      - name: atmosphere-build-container-image-ubuntu
-        soft: true
-      - name: atmosphere-build-container-image-ubuntu-cloud-archive
-        soft: true
-      - name: atmosphere-build-container-image-python-base
-        soft: true
-      - name: atmosphere-build-container-image-openstack-venv-builder
-        soft: true
-    vars: &container_image_vars
-      promote_container_image_job: atmosphere-build-container-image-python-openstackclient
-      container_images:
-        - context: images/python-openstackclient
-          registry: harbor.atmosphere.dev
-          repository: "{{ container_registry }}/python-openstackclient"
-          arch:
-            - linux/amd64
-          build_args:
-            - REGISTRY={{ container_registry }}
-            - "RELEASE={{ zuul.branch | replace('stable/', '') }}"
-          tags:
-            - "{{ zuul.branch | replace('stable/', '') }}"
-    files: &container_image_files
-      - images/ubuntu/.*
-      - images/ubuntu-cloud-archive/.*
-      - images/python-base/.*
-      - images/openstack-venv-builder/.*
-      - images/python-openstackclient/.*
-
-- job:
-    name: atmosphere-promote-container-image-python-openstackclient
-    parent: atmosphere-promote-container-image
-    vars: *container_image_vars
-    files: *container_image_files
diff --git a/zuul.d/container-images/staffeln.yaml b/zuul.d/container-images/staffeln.yaml
deleted file mode 100644
index 67070dd..0000000
--- a/zuul.d/container-images/staffeln.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright (c) 2024 VEXXHOST, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-- project:
-    check:
-      jobs:
-        - atmosphere-build-container-image-staffeln
-    gate:
-      jobs:
-        - atmosphere-build-container-image-staffeln
-    promote:
-      jobs:
-        - atmosphere-promote-container-image-staffeln
-
-- job:
-    name: atmosphere-build-container-image-staffeln
-    parent: atmosphere-build-container-image
-    dependencies:
-      - name: atmosphere-buildset-registry
-        soft: false
-      - name: atmosphere-build-container-image-ubuntu
-        soft: true
-      - name: atmosphere-build-container-image-ubuntu-cloud-archive
-        soft: true
-      - name: atmosphere-build-container-image-python-base
-        soft: true
-      - name: atmosphere-build-container-image-openstack-venv-builder
-        soft: true
-      - name: atmosphere-build-container-image-openstack-python-runtime
-        soft: true
-    vars: &container_image_vars
-      promote_container_image_job: atmosphere-build-container-image-staffeln
-      container_images:
-        - context: images/staffeln
-          registry: harbor.atmosphere.dev
-          repository: "{{ container_registry }}/staffeln"
-          arch:
-            - linux/amd64
-          build_args:
-            - REGISTRY={{ container_registry }}
-            - "RELEASE={{ zuul.branch | replace('stable/', '') }}"
-            - PROJECT=staffeln
-          tags:
-            - "{{ zuul.branch | replace('stable/', '') }}"
-    files: &container_image_files
-      - images/ubuntu/.*
-      - images/ubuntu-cloud-archive/.*
-      - images/python-base/.*
-      - images/openstack-venv-builder/.*
-      - images/openstack-python-runtime/.*
-      - images/staffeln/.*
-
-- job:
-    name: atmosphere-promote-container-image-staffeln
-    parent: atmosphere-promote-container-image
-    vars: *container_image_vars
-    files: *container_image_files
diff --git a/zuul.d/container-images/tempest.yaml b/zuul.d/container-images/tempest.yaml
deleted file mode 100644
index af9bafe..0000000
--- a/zuul.d/container-images/tempest.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright (c) 2024 VEXXHOST, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-- project:
-    check:
-      jobs:
-        - atmosphere-build-container-image-tempest
-    gate:
-      jobs:
-        - atmosphere-build-container-image-tempest
-    promote:
-      jobs:
-        - atmosphere-promote-container-image-tempest
-
-- job:
-    name: atmosphere-build-container-image-tempest
-    parent: atmosphere-build-container-image
-    dependencies:
-      - name: atmosphere-buildset-registry
-        soft: false
-      - name: atmosphere-build-container-image-ubuntu
-        soft: true
-      - name: atmosphere-build-container-image-ubuntu-cloud-archive
-        soft: true
-      - name: atmosphere-build-container-image-python-base
-        soft: true
-      - name: atmosphere-build-container-image-openstack-venv-builder
-        soft: true
-      - name: atmosphere-build-container-image-openstack-python-runtime
-        soft: true
-    vars: &container_image_vars
-      promote_container_image_job: atmosphere-build-container-image-tempest
-      container_images:
-        - context: images/tempest
-          registry: harbor.atmosphere.dev
-          repository: "{{ container_registry }}/tempest"
-          arch:
-            - linux/amd64
-          build_args:
-            - REGISTRY={{ container_registry }}
-            - "RELEASE={{ zuul.branch | replace('stable/', '') }}"
-            - PROJECT=tempest
-          tags:
-            - "{{ zuul.branch | replace('stable/', '') }}"
-    files: &container_image_files
-      - images/ubuntu/.*
-      - images/ubuntu-cloud-archive/.*
-      - images/python-base/.*
-      - images/openstack-venv-builder/.*
-      - images/openstack-python-runtime/.*
-      - images/tempest/.*
-
-- job:
-    name: atmosphere-promote-container-image-tempest
-    parent: atmosphere-promote-container-image
-    vars: *container_image_vars
-    files: *container_image_files
diff --git a/zuul.d/container-images/ubuntu-cloud-archive.yaml b/zuul.d/container-images/ubuntu-cloud-archive.yaml
deleted file mode 100644
index 2e7431b..0000000
--- a/zuul.d/container-images/ubuntu-cloud-archive.yaml
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright (c) 2024 VEXXHOST, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-- project:
-    check:
-      jobs:
-        - atmosphere-build-container-image-ubuntu-cloud-archive
-    gate:
-      jobs:
-        - atmosphere-build-container-image-ubuntu-cloud-archive
-    promote:
-      jobs:
-        - atmosphere-promote-container-image-ubuntu-cloud-archive
-
-- job:
-    name: atmosphere-build-container-image-ubuntu-cloud-archive
-    parent: atmosphere-build-container-image
-    dependencies:
-      - name: atmosphere-buildset-registry
-        soft: false
-      - name: atmosphere-build-container-image-ubuntu
-        soft: true
-    vars: &container_image_vars
-      promote_container_image_job: atmosphere-build-container-image-ubuntu-cloud-archive
-      container_images:
-        - context: images/ubuntu-cloud-archive
-          registry: harbor.atmosphere.dev
-          repository: "{{ container_registry }}/ubuntu-cloud-archive"
-          arch:
-            - linux/amd64
-            - linux/arm64
-          build_args:
-            - REGISTRY={{ container_registry }}
-            - "RELEASE={{ zuul.branch | replace('stable/', '') }}"
-          tags:
-            - "{{ zuul.branch | replace('stable/', '') }}"
-    files: &container_image_files
-      - images/ubuntu/.*
-      - images/ubuntu-cloud-archive/.*
-
-- job:
-    name: atmosphere-promote-container-image-ubuntu-cloud-archive
-    parent: atmosphere-promote-container-image
-    vars: *container_image_vars
-    files: *container_image_files
diff --git a/zuul.d/container-images/ubuntu.yaml b/zuul.d/container-images/ubuntu.yaml
deleted file mode 100644
index 886aa64..0000000
--- a/zuul.d/container-images/ubuntu.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright (c) 2024 VEXXHOST, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-- project:
-    check:
-      jobs:
-        - atmosphere-build-container-image-ubuntu
-    gate:
-      jobs:
-        - atmosphere-build-container-image-ubuntu
-    promote:
-      jobs:
-        - atmosphere-promote-container-image-ubuntu
-
-- job:
-    name: atmosphere-build-container-image-ubuntu
-    parent: atmosphere-build-container-image
-    dependencies:
-      - name: atmosphere-buildset-registry
-        soft: false
-    vars: &container_image_vars
-      promote_container_image_job: atmosphere-build-container-image-ubuntu
-      container_images:
-        - context: images/ubuntu
-          registry: harbor.atmosphere.dev
-          repository: "{{ container_registry }}/ubuntu"
-          arch:
-            - linux/amd64
-            - linux/arm64
-          build_args:
-            - REGISTRY={{ container_registry }}
-            - "RELEASE={{ zuul.branch | replace('stable/', '') }}"
-          tags:
-            - "{{ zuul.branch | replace('stable/', '') }}"
-    files: &container_image_files
-      - images/ubuntu/.*
-
-- job:
-    name: atmosphere-promote-container-image-ubuntu
-    parent: atmosphere-promote-container-image
-    vars: *container_image_vars
-    files: *container_image_files
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 13d9aea..970c59b 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -46,6 +46,25 @@
     parent: tox
 
 - job:
+    name: atmosphere-build-images
+    parent: depot-bake
+    vars:
+      depot_bake_project_id: jd10vkmkwv
+      depot_bake_environment:
+        REGISTRY: harbor.atmosphere.dev/ci
+        TAG: "{{ zuul.change }}"
+    files: &image_build_files
+      - ^images/
+      - docker-bake.hcl
+
+- job:
+    name: atmosphere-promote-images
+    parent: promote-depot-bake
+    files: *image_build_files
+    vars:
+      promote_depot_bake_job: atmosphere-build-images
+
+- job:
     name: atmosphere-build-collection
     parent: build-ansible-collection
     pre-run:
diff --git a/zuul.d/playbooks/build-collection/pre.yml b/zuul.d/playbooks/build-collection/pre.yml
index 450407b..7319377 100644
--- a/zuul.d/playbooks/build-collection/pre.yml
+++ b/zuul.d/playbooks/build-collection/pre.yml
@@ -16,7 +16,7 @@
   ansible.builtin.import_playbook: ../common/generate-changelog.yml
 
 - name: Configure Buildset Registry
-  ansible.builtin.import_playbook: ../common/configure-buildset-registry.yml
+  ansible.builtin.import_playbook: ../common/configure-ci-registry.yml
 
 - name: Prepare for collection build
   hosts: all
diff --git a/zuul.d/playbooks/common/configure-buildset-registry.yml b/zuul.d/playbooks/common/configure-buildset-registry.yml
deleted file mode 100644
index 7ab8e75..0000000
--- a/zuul.d/playbooks/common/configure-buildset-registry.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-- name: Configure Buildset Registry
-  hosts: all
-  tasks:
-    # NOTE(mnaser): This can be removed once the following merges
-    #               https://review.opendev.org/c/zuul/zuul-jobs/+/915025
-    - name: Load "buildset_registry" fact
-      block:
-        - name: Check for results.json
-          stat:
-            path: "{{ zuul.executor.result_data_file }}"
-          register: result_json_stat
-          delegate_to: localhost
-        - name: Load information from zuul_return
-          no_log: true
-          set_fact:
-            buildset_registry: "{{ (lookup('file', zuul.executor.result_data_file) | from_json)['secret_data']['buildset_registry'] }}"
-          when:
-            - buildset_registry is not defined
-            - result_json_stat.stat.exists
-            - result_json_stat.stat.size > 0
-            - "'buildset_registry' in (lookup('file', zuul.executor.result_data_file) | from_json).get('secret_data')"
-
-    - name: Configure buildset registry
-      when: buildset_registry is defined
-      block:
-        - name: Install CA certificate for the registry
-          become: true
-          ansible.builtin.copy:
-            content: "{{ buildset_registry.cert }}"
-            dest: /usr/local/share/ca-certificates/registry.crt
-        - name: Update CA certificates
-          become: true
-          ansible.builtin.shell: update-ca-certificates
-        - name: Replace the registry in image manifest
-          ansible.builtin.replace:
-            path: "{{ zuul.project.src_dir }}/roles/defaults/vars/main.yml"
-            regexp: "{{ repo }}:"
-            replace: '{{ buildset_registry.host }}:{{ buildset_registry.port }}/{{ repo }}:'
-          loop: "{{ zuul.artifacts | default([]) }}"
-          loop_control:
-            loop_var: zj_zuul_artifact
-          when: "'metadata' in zj_zuul_artifact and zj_zuul_artifact.metadata.type | default('') == 'container_image'"
-          vars:
-            repo: "{{ zj_zuul_artifact.metadata.repository }}"
-        - name: Print out the new image manifest file
-          ansible.builtin.command: |
-            cat {{ zuul.project.src_dir }}/roles/defaults/vars/main.yml
diff --git a/zuul.d/playbooks/common/configure-ci-registry.yml b/zuul.d/playbooks/common/configure-ci-registry.yml
new file mode 100644
index 0000000..57684a1
--- /dev/null
+++ b/zuul.d/playbooks/common/configure-ci-registry.yml
@@ -0,0 +1,20 @@
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+- name: Configure CI registry
+  hosts: all
+  tasks:
+    - name: Replace the registry in image manifest
+      ansible.builtin.replace:
+        path: "{{ zuul.project.src_dir }}/roles/defaults/vars/main.yml"
+        regexp: "{{ zj_zuul_artifact.metadata.repository | regex_replace('/ci/', '/library/', 1) }}:.*"
+        replace: '{{ zj_zuul_artifact.metadata.repository }}:{{ zj_zuul_artifact.metadata.tag }}"'
+      loop: "{{ zuul.artifacts | default([]) }}"
+      loop_control:
+        loop_var: zj_zuul_artifact
+      when:
+        - "'metadata' in zj_zuul_artifact"
+        - "zj_zuul_artifact.metadata.type | default('') == 'container_image'"
+
+    - name: Print out the new image manifest file
+      ansible.builtin.command: |
+        cat {{ zuul.project.src_dir }}/roles/defaults/vars/main.yml
diff --git a/zuul.d/playbooks/molecule/pre.yml b/zuul.d/playbooks/molecule/pre.yml
index 932838e..4d9dfed 100644
--- a/zuul.d/playbooks/molecule/pre.yml
+++ b/zuul.d/playbooks/molecule/pre.yml
@@ -44,4 +44,4 @@
         chdir: "{{ zuul.project.src_dir }}"
 
 - name: Configure Buildset Registry
-  ansible.builtin.import_playbook: ../common/configure-buildset-registry.yml
+  ansible.builtin.import_playbook: ../common/configure-ci-registry.yml
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 415ab66..9d34783 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -22,55 +22,10 @@
         - atmosphere-tox-promtool-test
         - atmosphere-tox-helm-unittest
         - atmosphere-tox-py3
+        - atmosphere-build-images
         - atmosphere-build-collection:
             dependencies: &image_build_jobs
-              - name: atmosphere-build-container-image-barbican
-                soft: true
-              - name: atmosphere-build-container-image-cinder
-                soft: true
-              - name: atmosphere-build-container-image-designate
-                soft: true
-              - name: atmosphere-build-container-image-glance
-                soft: true
-              - name: atmosphere-build-container-image-heat
-                soft: true
-              - name: atmosphere-build-container-image-horizon
-                soft: true
-              - name: atmosphere-build-container-image-ironic
-                soft: true
-              - name: atmosphere-build-container-image-keepalived
-                soft: true
-              - name: atmosphere-build-container-image-keystone
-                soft: true
-              - name: atmosphere-build-container-image-kubernetes-entrypoint
-                soft: true
-              - name: atmosphere-build-container-image-libvirtd
-                soft: true
-              - name: atmosphere-build-container-image-magnum
-                soft: true
-              - name: atmosphere-build-container-image-manila
-                soft: true
-              - name: atmosphere-build-container-image-netoffload
-                soft: true
-              - name: atmosphere-build-container-image-neutron
-                soft: true
-              - name: atmosphere-build-container-image-nova
-                soft: true
-              - name: atmosphere-build-container-image-nova-ssh
-                soft: true
-              - name: atmosphere-build-container-image-octavia
-                soft: true
-              - name: atmosphere-build-container-image-openvswitch
-                soft: true
-              - name: atmosphere-build-container-image-ovn
-                soft: true
-              - name: atmosphere-build-container-image-placement
-                soft: true
-              - name: atmosphere-build-container-image-python-openstackclient
-                soft: true
-              - name: atmosphere-build-container-image-staffeln
-                soft: true
-              - name: atmosphere-build-container-image-tempest
+              - name: atmosphere-build-images
                 soft: true
         - atmosphere-molecule-aio-keycloak:
             dependencies: *image_build_jobs
@@ -89,6 +44,7 @@
         - atmosphere-golang-go-test
         - atmosphere-linters
         - atmosphere-tox-py3
+        - atmosphere-build-images
         - atmosphere-build-collection:
             dependencies: *image_build_jobs
         - atmosphere-molecule-aio-keycloak:
@@ -104,6 +60,9 @@
     release:
       jobs:
         - atmosphere-publish-collection
+    promote:
+      jobs:
+        - atmosphere-promote-images
     periodic:
       jobs:
         - atmosphere-molecule-aio-upgrade-openvswitch: