diff --git a/.zuul.yaml b/.zuul.yaml
index a05a29d187..9a7b55c658 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1189,7 +1189,6 @@
     parent: system-config-run
     description: |
       Run the playbook for the docker registry.
-    dependencies: opendev-buildset-registry
     nodeset:
       nodes:
         - name: bridge.openstack.org
@@ -1216,7 +1215,7 @@
 
 - job:
     name: system-config-run-gitea
-    parent: system-config-run
+    parent: system-config-run-containers
     description: |
       Run the playbook for the gitea servers.
     timeout: 3600
@@ -1305,7 +1304,6 @@
     parent: system-config-run
     description: |
       Run the playbook for the docker registry.
-    dependencies: opendev-buildset-registry
     nodeset:
       nodes:
         - name: bridge.openstack.org
@@ -1322,7 +1320,7 @@
 
 - job:
     name: system-config-run-review
-    parent: system-config-run
+    parent: system-config-run-containers
     description: |
       Run the playbook for gerrit (in a container).
     requires: gerrit-2.13-container-image