diff --git a/zuul.d/container-images/cluster-api-provider-openstack.yaml b/zuul.d/container-images/cluster-api-provider-openstack.yaml
index 53394e4c8..a5b5b62b0 100644
--- a/zuul.d/container-images/cluster-api-provider-openstack.yaml
+++ b/zuul.d/container-images/cluster-api-provider-openstack.yaml
@@ -26,6 +26,9 @@
 - job:
     name: atmosphere-build-container-image-cluster-api-provider-openstack
     parent: atmosphere-build-container-image
+    dependencies:
+      - name: atmosphere-buildset-registry
+        soft: false
     vars: &container_image_vars
       promote_container_image_job: atmosphere-upload-container-image-cluster-api-provider-openstack
       container_images:
diff --git a/zuul.d/container-images/kubernetes-entrypoint.yaml b/zuul.d/container-images/kubernetes-entrypoint.yaml
index ea04bde60..0d87c0632 100644
--- a/zuul.d/container-images/kubernetes-entrypoint.yaml
+++ b/zuul.d/container-images/kubernetes-entrypoint.yaml
@@ -26,6 +26,9 @@
 - 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-upload-container-image-kubernetes-entrypoint
       container_images:
diff --git a/zuul.d/container-images/openvswitch.yaml b/zuul.d/container-images/openvswitch.yaml
index 67a55c6f5..e167d5346 100644
--- a/zuul.d/container-images/openvswitch.yaml
+++ b/zuul.d/container-images/openvswitch.yaml
@@ -26,6 +26,9 @@
 - 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-upload-container-image-openvswitch
       container_images:
diff --git a/zuul.d/container-images/python-openstackclient.yaml b/zuul.d/container-images/python-openstackclient.yaml
index 09475df40..fcd4a993e 100644
--- a/zuul.d/container-images/python-openstackclient.yaml
+++ b/zuul.d/container-images/python-openstackclient.yaml
@@ -27,6 +27,8 @@
     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
diff --git a/zuul.d/container-images/ubuntu.yaml b/zuul.d/container-images/ubuntu.yaml
index 5e39b95ab..28270cd9f 100644
--- a/zuul.d/container-images/ubuntu.yaml
+++ b/zuul.d/container-images/ubuntu.yaml
@@ -26,6 +26,9 @@
 - 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-upload-container-image-ubuntu
       container_images: