diff --git a/.zuul.yaml b/.zuul.yaml
index 2169ff0eb7..b190eb9cad 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -53,6 +53,8 @@
     name: system-config-build-image-jinja-init
     description: Build a jinja-init image.
     parent: system-config-build-image
+    requires: python-base-container-image
+    provides: jinja-init-container-image
     vars: &jinja-init_vars
       docker_images:
         - context: docker/jinja-init
@@ -66,6 +68,8 @@
     name: system-config-upload-image-jinja-init
     description: Build and upload a jinja-init image.
     parent: system-config-upload-image
+    requires: python-base-container-image
+    provides: jinja-init-container-image
     vars: *jinja-init_vars
     files: *jinja-init_files
 
@@ -81,6 +85,7 @@
     name: system-config-build-image-gitea-init
     description: Build a gitea-init image.
     parent: system-config-build-image
+    requires: jinja-init-container-image
     vars: &gitea-init_vars
       docker_images:
         - context: docker/gitea-init
@@ -95,6 +100,7 @@
     name: system-config-upload-image-gitea-init
     description: Build and upload a gitea-init image.
     parent: system-config-upload-image
+    requires: jinja-init-container-image
     vars: *gitea-init_vars
     files: *gitea-init_files
 
@@ -141,6 +147,7 @@
     name: system-config-build-image-haproxy-statsd
     description: Build a haproxy-statsd image.
     parent: system-config-build-image
+    requires: python-base-container-image
     vars: &haproxy-statsd_vars
       docker_images:
         - context: docker/haproxy-statsd
@@ -154,6 +161,7 @@
     name: system-config-upload-image-haproxy-statsd
     description: Build and upload a haproxy-statsd image.
     parent: system-config-upload-image
+    requires: python-base-container-image
     vars: *haproxy-statsd_vars
     files: *haproxy-statsd_files
 
@@ -201,6 +209,7 @@
     parent: system-config-build-image
     pre-run: playbooks/zuul/gerrit/repos.yaml
     run: playbooks/zuul/gerrit/run.yaml
+    requires: gerrit-base-container-image
     required-projects: &gerrit_projects_2_15
       - name: gerrit.googlesource.com/gerrit
         override-checkout: stable-2.15
@@ -241,6 +250,7 @@
     parent: system-config-upload-image
     pre-run: playbooks/zuul/gerrit/repos.yaml
     run: playbooks/zuul/gerrit/run.yaml
+    requires: gerrit-base-container-image
     required-projects: *gerrit_projects_2_15
     vars: *gerrit_vars_2_15
     files: *gerrit_files_2_15
@@ -259,6 +269,7 @@
     parent: system-config-build-image
     pre-run: playbooks/zuul/gerrit/repos.yaml
     run: playbooks/zuul/gerrit/run.yaml
+    requires: gerrit-base-container-image
     required-projects: &gerrit_projects_2_16
       - name: gerrit.googlesource.com/gerrit
         override-checkout: stable-2.16
@@ -303,6 +314,7 @@
     parent: system-config-upload-image
     pre-run: playbooks/zuul/gerrit/repos.yaml
     run: playbooks/zuul/gerrit/run.yaml
+    requires: gerrit-base-container-image
     required-projects: *gerrit_projects_2_16
     vars: *gerrit_vars_2_16
     files: *gerrit_files_2_16
@@ -321,6 +333,7 @@
     parent: system-config-build-image
     pre-run: playbooks/zuul/gerrit/repos.yaml
     run: playbooks/zuul/gerrit/run.yaml
+    requires: gerrit-base-container-image
     required-projects: &gerrit_projects_3_0
       - name: gerrit.googlesource.com/gerrit
         override-checkout: stable-3.0
@@ -377,6 +390,7 @@
     parent: system-config-upload-image
     pre-run: playbooks/zuul/gerrit/repos.yaml
     run: playbooks/zuul/gerrit/run.yaml
+    requires: gerrit-base-container-image
     required-projects: *gerrit_projects_3_0
     vars: *gerrit_vars_3_0
     files: *gerrit_files_3_0
@@ -400,6 +414,7 @@
       - playbooks/zuul/gerrit/repos.yaml
       - playbooks/zuul/gerrit/submodules.yaml
     run: playbooks/zuul/gerrit/run.yaml
+    requires: gerrit-base-container-image
     required-projects: &gerrit_projects_master
       - opendev/system-config
       - gerrit.googlesource.com/jgit
@@ -457,6 +472,7 @@
       - playbooks/zuul/gerrit/repos.yaml
       - playbooks/zuul/gerrit/submodules.yaml
     run: playbooks/zuul/gerrit/run.yaml
+    requires: gerrit-base-container-image
     required-projects: *gerrit_projects_master
     vars: *gerrit_vars_master
     files: *gerrit_files_master
@@ -473,6 +489,7 @@
     name: system-config-build-image-python-builder
     description: Build a python-builder image.
     parent: system-config-build-image
+    provides: python-builder-container-image
     vars: &python-builder_vars
       docker_images:
         - context: docker/python-builder
@@ -485,6 +502,7 @@
     name: system-config-upload-image-python-builder
     description: Build and upload a python-builder image.
     parent: system-config-upload-image
+    provides: python-builder-container-image
     vars: *python-builder_vars
     files: *python-builder_files
 
@@ -500,6 +518,7 @@
     name: system-config-build-image-python-base
     description: Build a python-base image.
     parent: system-config-build-image
+    provides: python-base-container-image
     vars: &python-base_vars
       docker_images:
         - context: docker/python-base
@@ -512,6 +531,7 @@
     name: system-config-upload-image-python-base
     description: Build and upload a python-base image.
     parent: system-config-upload-image
+    provides: python-base-container-image
     vars: *python-base_vars
     files: *python-base_files
 
@@ -555,6 +575,8 @@
     parent: system-config-build-image
     required-projects: &gerrit_base_projects
       - opendev/jeepyb
+    requires: python-builder-container-image
+    provides: gerrit-base-container-image
     vars: &gerrit-base_vars
       docker_images:
         - context: docker/gerrit/base
@@ -567,6 +589,8 @@
     name: system-config-upload-image-gerrit-base
     description: Build and upload a gerrit-base image.
     parent: system-config-upload-image
+    requires: python-builder-container-image
+    provides: gerrit-base-container-image
     required-projects: *gerrit_base_projects
     vars: *gerrit-base_vars
     files: *gerrit-base_files