diff --git a/zuul.d/container-images/barbican.yaml b/zuul.d/container-images/barbican.yaml
index 73d178e..da767db 100644
--- a/zuul.d/container-images/barbican.yaml
+++ b/zuul.d/container-images/barbican.yaml
@@ -27,6 +27,8 @@
     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
@@ -62,6 +64,8 @@
     name: atmosphere-upload-container-image-barbican
     parent: atmosphere-upload-container-image
     dependencies:
+      - name: atmosphere-buildset-registry
+        soft: false
       - name: atmosphere-upload-container-image-ubuntu
         soft: true
       - name: atmosphere-upload-container-image-ubuntu-cloud-archive
diff --git a/zuul.d/container-images/base.yaml b/zuul.d/container-images/base.yaml
index 6e33526..f2467fe 100644
--- a/zuul.d/container-images/base.yaml
+++ b/zuul.d/container-images/base.yaml
@@ -28,9 +28,6 @@
     name: atmosphere-build-container-image
     parent: ci-build-container-image
     abstract: true
-    dependencies:
-      - name: atmosphere-buildset-registry
-        soft: false
     vars: &image_vars
       container_command: docker
       promote_container_image_method: intermediate-registry
@@ -44,9 +41,6 @@
     name: atmosphere-upload-container-image
     parent: ci-upload-container-image
     abstract: true
-    dependencies:
-      - name: atmosphere-buildset-registry
-        soft: false
     secrets:
       name: container_registry_credentials
       secret: atmosphere-registry-credentials
diff --git a/zuul.d/container-images/cinder.yaml b/zuul.d/container-images/cinder.yaml
index fa7a675..55c9442 100644
--- a/zuul.d/container-images/cinder.yaml
+++ b/zuul.d/container-images/cinder.yaml
@@ -27,6 +27,8 @@
     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
@@ -62,6 +64,8 @@
     name: atmosphere-upload-container-image-cinder
     parent: atmosphere-upload-container-image
     dependencies:
+      - name: atmosphere-buildset-registry
+        soft: false
       - name: atmosphere-upload-container-image-ubuntu
         soft: true
       - name: atmosphere-upload-container-image-ubuntu-cloud-archive
diff --git a/zuul.d/container-images/designate.yaml b/zuul.d/container-images/designate.yaml
index 9ff13fd..bfc3c6a 100644
--- a/zuul.d/container-images/designate.yaml
+++ b/zuul.d/container-images/designate.yaml
@@ -27,6 +27,8 @@
     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
@@ -62,6 +64,8 @@
     name: atmosphere-upload-container-image-designate
     parent: atmosphere-upload-container-image
     dependencies:
+      - name: atmosphere-buildset-registry
+        soft: false
       - name: atmosphere-upload-container-image-ubuntu
         soft: true
       - name: atmosphere-upload-container-image-ubuntu-cloud-archive
diff --git a/zuul.d/container-images/glance.yaml b/zuul.d/container-images/glance.yaml
index 69b5433..6f92bed 100644
--- a/zuul.d/container-images/glance.yaml
+++ b/zuul.d/container-images/glance.yaml
@@ -27,6 +27,8 @@
     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
@@ -62,6 +64,8 @@
     name: atmosphere-upload-container-image-glance
     parent: atmosphere-upload-container-image
     dependencies:
+      - name: atmosphere-buildset-registry
+        soft: false
       - name: atmosphere-upload-container-image-ubuntu
         soft: true
       - name: atmosphere-upload-container-image-ubuntu-cloud-archive
diff --git a/zuul.d/container-images/heat.yaml b/zuul.d/container-images/heat.yaml
index 52403ef..5b4087e 100644
--- a/zuul.d/container-images/heat.yaml
+++ b/zuul.d/container-images/heat.yaml
@@ -27,6 +27,8 @@
     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
@@ -62,6 +64,8 @@
     name: atmosphere-upload-container-image-heat
     parent: atmosphere-upload-container-image
     dependencies:
+      - name: atmosphere-buildset-registry
+        soft: false
       - name: atmosphere-upload-container-image-ubuntu
         soft: true
       - name: atmosphere-upload-container-image-ubuntu-cloud-archive
diff --git a/zuul.d/container-images/horizon.yaml b/zuul.d/container-images/horizon.yaml
index 914053d..a9de5a2 100644
--- a/zuul.d/container-images/horizon.yaml
+++ b/zuul.d/container-images/horizon.yaml
@@ -27,6 +27,8 @@
     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
@@ -62,6 +64,8 @@
     name: atmosphere-upload-container-image-horizon
     parent: atmosphere-upload-container-image
     dependencies:
+      - name: atmosphere-buildset-registry
+        soft: false
       - name: atmosphere-upload-container-image-ubuntu
         soft: true
       - name: atmosphere-upload-container-image-ubuntu-cloud-archive
diff --git a/zuul.d/container-images/ironic.yaml b/zuul.d/container-images/ironic.yaml
index 3e16dd1..780a02c 100644
--- a/zuul.d/container-images/ironic.yaml
+++ b/zuul.d/container-images/ironic.yaml
@@ -27,6 +27,8 @@
     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
@@ -62,6 +64,8 @@
     name: atmosphere-upload-container-image-ironic
     parent: atmosphere-upload-container-image
     dependencies:
+      - name: atmosphere-buildset-registry
+        soft: false
       - name: atmosphere-upload-container-image-ubuntu
         soft: true
       - name: atmosphere-upload-container-image-ubuntu-cloud-archive
diff --git a/zuul.d/container-images/keepalived.yaml b/zuul.d/container-images/keepalived.yaml
index 68f462a..81b18f0 100644
--- a/zuul.d/container-images/keepalived.yaml
+++ b/zuul.d/container-images/keepalived.yaml
@@ -27,6 +27,8 @@
     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
@@ -49,6 +51,8 @@
     name: atmosphere-upload-container-image-keepalived
     parent: atmosphere-upload-container-image
     dependencies:
+      - name: atmosphere-buildset-registry
+        soft: false
       - name: atmosphere-upload-container-image-ubuntu
         soft: true
     vars: *container_image_vars
diff --git a/zuul.d/container-images/keystone.yaml b/zuul.d/container-images/keystone.yaml
index 791f3ce..74f04b2 100644
--- a/zuul.d/container-images/keystone.yaml
+++ b/zuul.d/container-images/keystone.yaml
@@ -27,6 +27,8 @@
     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
@@ -62,6 +64,8 @@
     name: atmosphere-upload-container-image-keystone
     parent: atmosphere-upload-container-image
     dependencies:
+      - name: atmosphere-buildset-registry
+        soft: false
       - name: atmosphere-upload-container-image-ubuntu
         soft: true
       - name: atmosphere-upload-container-image-ubuntu-cloud-archive
diff --git a/zuul.d/container-images/libvirt-tls-sidecar.yaml b/zuul.d/container-images/libvirt-tls-sidecar.yaml
index 76dfd48..0899068 100644
--- a/zuul.d/container-images/libvirt-tls-sidecar.yaml
+++ b/zuul.d/container-images/libvirt-tls-sidecar.yaml
@@ -27,6 +27,8 @@
     name: atmosphere-build-container-image-libvirt-tls-sidecar
     parent: atmosphere-build-container-image
     dependencies:
+      - name: atmosphere-buildset-registry
+        soft: false
       - name: atmosphere-build-container-image-ubuntu
         soft: true
     vars: &container_image_vars
@@ -54,6 +56,8 @@
     name: atmosphere-upload-container-image-libvirt-tls-sidecar
     parent: atmosphere-upload-container-image
     dependencies:
+      - name: atmosphere-buildset-registry
+        soft: false
       - name: atmosphere-upload-container-image-ubuntu
         soft: true
     vars: *container_image_vars
diff --git a/zuul.d/container-images/libvirtd.yaml b/zuul.d/container-images/libvirtd.yaml
index dc2d6d2..0c34b3e 100644
--- a/zuul.d/container-images/libvirtd.yaml
+++ b/zuul.d/container-images/libvirtd.yaml
@@ -27,6 +27,8 @@
     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
@@ -55,6 +57,8 @@
     name: atmosphere-upload-container-image-libvirtd
     parent: atmosphere-upload-container-image
     dependencies:
+      - name: atmosphere-buildset-registry
+        soft: false
       - name: atmosphere-upload-container-image-ubuntu
         soft: true
       - name: atmosphere-upload-container-image-ubuntu-cloud-archive
diff --git a/zuul.d/container-images/magnum.yaml b/zuul.d/container-images/magnum.yaml
index 234e591..7751cef 100644
--- a/zuul.d/container-images/magnum.yaml
+++ b/zuul.d/container-images/magnum.yaml
@@ -27,6 +27,8 @@
     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
@@ -62,6 +64,8 @@
     name: atmosphere-upload-container-image-magnum
     parent: atmosphere-upload-container-image
     dependencies:
+      - name: atmosphere-buildset-registry
+        soft: false
       - name: atmosphere-upload-container-image-ubuntu
         soft: true
       - name: atmosphere-upload-container-image-ubuntu-cloud-archive
diff --git a/zuul.d/container-images/manila.yaml b/zuul.d/container-images/manila.yaml
index 2d71690..ad298ff 100644
--- a/zuul.d/container-images/manila.yaml
+++ b/zuul.d/container-images/manila.yaml
@@ -27,6 +27,8 @@
     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
@@ -62,6 +64,8 @@
     name: atmosphere-upload-container-image-manila
     parent: atmosphere-upload-container-image
     dependencies:
+      - name: atmosphere-buildset-registry
+        soft: false
       - name: atmosphere-upload-container-image-ubuntu
         soft: true
       - name: atmosphere-upload-container-image-ubuntu-cloud-archive
diff --git a/zuul.d/container-images/netoffload.yaml b/zuul.d/container-images/netoffload.yaml
index 2ca86b4..50620c5 100644
--- a/zuul.d/container-images/netoffload.yaml
+++ b/zuul.d/container-images/netoffload.yaml
@@ -27,6 +27,8 @@
     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
@@ -49,6 +51,8 @@
     name: atmosphere-upload-container-image-netoffload
     parent: atmosphere-upload-container-image
     dependencies:
+      - name: atmosphere-buildset-registry
+        soft: false
       - name: atmosphere-upload-container-image-ubuntu
         soft: true
     vars: *container_image_vars
diff --git a/zuul.d/container-images/neutron.yaml b/zuul.d/container-images/neutron.yaml
index 5612ff8..8e9557d 100644
--- a/zuul.d/container-images/neutron.yaml
+++ b/zuul.d/container-images/neutron.yaml
@@ -27,6 +27,8 @@
     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
@@ -62,6 +64,8 @@
     name: atmosphere-upload-container-image-neutron
     parent: atmosphere-upload-container-image
     dependencies:
+      - name: atmosphere-buildset-registry
+        soft: false
       - name: atmosphere-upload-container-image-ubuntu
         soft: true
       - name: atmosphere-upload-container-image-ubuntu-cloud-archive
diff --git a/zuul.d/container-images/nova-ssh.yaml b/zuul.d/container-images/nova-ssh.yaml
index d7801c1..3650306 100644
--- a/zuul.d/container-images/nova-ssh.yaml
+++ b/zuul.d/container-images/nova-ssh.yaml
@@ -27,6 +27,8 @@
     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
@@ -56,6 +58,8 @@
     name: atmosphere-upload-container-image-nova-ssh
     parent: atmosphere-upload-container-image
     dependencies:
+      - name: atmosphere-buildset-registry
+        soft: false
       - name: atmosphere-upload-container-image-ubuntu
         soft: true
       - name: atmosphere-upload-container-image-ubuntu-cloud-archive
diff --git a/zuul.d/container-images/nova.yaml b/zuul.d/container-images/nova.yaml
index 5b415c3..3d07802 100644
--- a/zuul.d/container-images/nova.yaml
+++ b/zuul.d/container-images/nova.yaml
@@ -27,6 +27,8 @@
     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
@@ -62,6 +64,8 @@
     name: atmosphere-upload-container-image-nova
     parent: atmosphere-upload-container-image
     dependencies:
+      - name: atmosphere-buildset-registry
+        soft: false
       - name: atmosphere-upload-container-image-ubuntu
         soft: true
       - name: atmosphere-upload-container-image-ubuntu-cloud-archive
diff --git a/zuul.d/container-images/octavia.yaml b/zuul.d/container-images/octavia.yaml
index e8555a3..d7c74ac 100644
--- a/zuul.d/container-images/octavia.yaml
+++ b/zuul.d/container-images/octavia.yaml
@@ -27,6 +27,8 @@
     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
@@ -62,6 +64,8 @@
     name: atmosphere-upload-container-image-octavia
     parent: atmosphere-upload-container-image
     dependencies:
+      - name: atmosphere-buildset-registry
+        soft: false
       - name: atmosphere-upload-container-image-ubuntu
         soft: true
       - name: atmosphere-upload-container-image-ubuntu-cloud-archive
diff --git a/zuul.d/container-images/openstack-python-runtime.yaml b/zuul.d/container-images/openstack-python-runtime.yaml
index 5a7ce33..b2cbcca 100644
--- a/zuul.d/container-images/openstack-python-runtime.yaml
+++ b/zuul.d/container-images/openstack-python-runtime.yaml
@@ -27,6 +27,8 @@
     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
@@ -56,6 +58,8 @@
     name: atmosphere-upload-container-image-openstack-python-runtime
     parent: atmosphere-upload-container-image
     dependencies:
+      - name: atmosphere-buildset-registry
+        soft: false
       - name: atmosphere-upload-container-image-ubuntu
         soft: true
       - name: atmosphere-upload-container-image-ubuntu-cloud-archive
diff --git a/zuul.d/container-images/openstack-runtime.yaml b/zuul.d/container-images/openstack-runtime.yaml
index cde0737..9350890 100644
--- a/zuul.d/container-images/openstack-runtime.yaml
+++ b/zuul.d/container-images/openstack-runtime.yaml
@@ -27,6 +27,8 @@
     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
@@ -52,6 +54,8 @@
     name: atmosphere-upload-container-image-openstack-runtime
     parent: atmosphere-upload-container-image
     dependencies:
+      - name: atmosphere-buildset-registry
+        soft: false
       - name: atmosphere-upload-container-image-ubuntu
         soft: true
       - name: atmosphere-upload-container-image-ubuntu-cloud-archive
diff --git a/zuul.d/container-images/openstack-venv-builder.yaml b/zuul.d/container-images/openstack-venv-builder.yaml
index a50ee93..9c29e29 100644
--- a/zuul.d/container-images/openstack-venv-builder.yaml
+++ b/zuul.d/container-images/openstack-venv-builder.yaml
@@ -27,6 +27,8 @@
     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
@@ -55,6 +57,8 @@
     name: atmosphere-upload-container-image-openstack-venv-builder
     parent: atmosphere-upload-container-image
     dependencies:
+      - name: atmosphere-buildset-registry
+        soft: false
       - name: atmosphere-upload-container-image-ubuntu
         soft: true
       - name: atmosphere-upload-container-image-ubuntu-cloud-archive
diff --git a/zuul.d/container-images/ovn.yaml b/zuul.d/container-images/ovn.yaml
index 5a3e180..0c31387 100644
--- a/zuul.d/container-images/ovn.yaml
+++ b/zuul.d/container-images/ovn.yaml
@@ -27,6 +27,8 @@
     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
@@ -60,6 +62,8 @@
     name: atmosphere-upload-container-image-ovn
     parent: atmosphere-upload-container-image
     dependencies:
+      - name: atmosphere-buildset-registry
+        soft: false
       - name: atmosphere-upload-container-image-openvswitch
         soft: true
     vars: *container_image_vars
diff --git a/zuul.d/container-images/placement.yaml b/zuul.d/container-images/placement.yaml
index d020a79..a3a024d 100644
--- a/zuul.d/container-images/placement.yaml
+++ b/zuul.d/container-images/placement.yaml
@@ -27,6 +27,8 @@
     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
@@ -62,6 +64,8 @@
     name: atmosphere-upload-container-image-placement
     parent: atmosphere-upload-container-image
     dependencies:
+      - name: atmosphere-buildset-registry
+        soft: false
       - name: atmosphere-upload-container-image-ubuntu
         soft: true
       - name: atmosphere-upload-container-image-ubuntu-cloud-archive
diff --git a/zuul.d/container-images/python-base.yaml b/zuul.d/container-images/python-base.yaml
index 3e63e8c..0bb84e4 100644
--- a/zuul.d/container-images/python-base.yaml
+++ b/zuul.d/container-images/python-base.yaml
@@ -27,6 +27,8 @@
     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
@@ -52,6 +54,8 @@
     name: atmosphere-upload-container-image-python-base
     parent: atmosphere-upload-container-image
     dependencies:
+      - name: atmosphere-buildset-registry
+        soft: false
       - name: atmosphere-upload-container-image-ubuntu
         soft: true
       - name: atmosphere-upload-container-image-ubuntu-cloud-archive
diff --git a/zuul.d/container-images/senlin.yaml b/zuul.d/container-images/senlin.yaml
index fc12aa0..55ad02c 100644
--- a/zuul.d/container-images/senlin.yaml
+++ b/zuul.d/container-images/senlin.yaml
@@ -27,6 +27,8 @@
     name: atmosphere-build-container-image-senlin
     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
@@ -62,6 +64,8 @@
     name: atmosphere-upload-container-image-senlin
     parent: atmosphere-upload-container-image
     dependencies:
+      - name: atmosphere-buildset-registry
+        soft: false
       - name: atmosphere-upload-container-image-ubuntu
         soft: true
       - name: atmosphere-upload-container-image-ubuntu-cloud-archive
diff --git a/zuul.d/container-images/staffeln.yaml b/zuul.d/container-images/staffeln.yaml
index db01912..7cecc39 100644
--- a/zuul.d/container-images/staffeln.yaml
+++ b/zuul.d/container-images/staffeln.yaml
@@ -27,6 +27,8 @@
     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
@@ -62,6 +64,8 @@
     name: atmosphere-upload-container-image-staffeln
     parent: atmosphere-upload-container-image
     dependencies:
+      - name: atmosphere-buildset-registry
+        soft: false
       - name: atmosphere-upload-container-image-ubuntu
         soft: true
       - name: atmosphere-upload-container-image-ubuntu-cloud-archive
diff --git a/zuul.d/container-images/tempest.yaml b/zuul.d/container-images/tempest.yaml
index 1d81749..1a979e2 100644
--- a/zuul.d/container-images/tempest.yaml
+++ b/zuul.d/container-images/tempest.yaml
@@ -27,6 +27,8 @@
     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
@@ -62,6 +64,8 @@
     name: atmosphere-upload-container-image-tempest
     parent: atmosphere-upload-container-image
     dependencies:
+      - name: atmosphere-buildset-registry
+        soft: false
       - name: atmosphere-upload-container-image-ubuntu
         soft: true
       - name: atmosphere-upload-container-image-ubuntu-cloud-archive
diff --git a/zuul.d/container-images/ubuntu-cloud-archive.yaml b/zuul.d/container-images/ubuntu-cloud-archive.yaml
index d2d23ba..563fc34 100644
--- a/zuul.d/container-images/ubuntu-cloud-archive.yaml
+++ b/zuul.d/container-images/ubuntu-cloud-archive.yaml
@@ -27,6 +27,8 @@
     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
@@ -49,6 +51,8 @@
     name: atmosphere-upload-container-image-ubuntu-cloud-archive
     parent: atmosphere-upload-container-image
     dependencies:
+      - name: atmosphere-buildset-registry
+        soft: false
       - name: atmosphere-upload-container-image-ubuntu
         soft: true
     vars: *container_image_vars