diff --git a/.zuul.yaml b/.zuul.yaml
index 4b42522712..e7a1cad898 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -42,11 +42,17 @@
 - job:
     name: system-config-build-image
     parent: build-docker-image
+    dependencies: opendev-buildset-registry
+    requires: docker-image
+    provides: docker-image
     abstract: true
 
 - job:
     name: system-config-upload-image
     parent: upload-docker-image
+    dependencies: opendev-buildset-registry
+    requires: docker-image
+    provides: docker-image
     abstract: true
     secrets:
       name: docker_credentials
@@ -481,6 +487,7 @@
     parent: system-config-run
     description: |
       Run the playbook for the docker registry.
+    dependencies: opendev-buildset-registry
     nodeset:
       nodes:
         - name: bridge.openstack.org
@@ -505,6 +512,7 @@
     parent: system-config-run
     description: |
       Run the playbook for the gitea servers.
+    dependencies: opendev-buildset-registry
     nodeset:
       nodes:
         - name: bridge.openstack.org
@@ -538,6 +546,8 @@
     parent: system-config-run
     description: |
       Run the playbook for the docker registry.
+    dependencies: opendev-buildset-registry
+    requires: docker-image
     nodeset:
       nodes:
         - name: bridge.openstack.org
@@ -584,6 +594,7 @@
       - publish-tox-docs-infra
     check:
       jobs:
+        - opendev-buildset-registry
         - tox-linters
         - legacy-system-config-puppet-syntax-3
         - puppet-beaker-rspec-infra-system-config
@@ -607,6 +618,7 @@
         - system-config-build-image-python-builder
     gate:
       jobs:
+        - opendev-buildset-registry
         - tox-linters
         - legacy-system-config-puppet-syntax-3
         - puppet-beaker-rspec-infra-system-config