diff --git a/.zuul.yaml b/.zuul.yaml
index a968f71009..f357c6ce6e 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -240,6 +240,9 @@
         - context: .
           registry: quay.io
           repository: quay.io/zuul-ci/zuul
+          namespace: zuul-ci
+          repo_shortname: zuul
+          repo_description: Base Zuul image.
           target: zuul
           tags:
             # If zuul.tag is defined: [ '3', '3.19', '3.19.0' ].  Only works for 3-component tags.
@@ -248,26 +251,41 @@
         - context: .
           registry: quay.io
           repository: quay.io/zuul-ci/zuul-executor
+          namespace: zuul-ci
+          repo_shortname: zuul-executor
+          repo_description: Zuul executor image
           target: zuul-executor
           tags: *imagetag
         - context: .
           registry: quay.io
           repository: quay.io/zuul-ci/zuul-fingergw
+          namespace: zuul-ci
+          repo_shortname: zuul-fingergw
+          repo_description: Zuul fingergw image
           target: zuul-fingergw
           tags: *imagetag
         - context: .
           registry: quay.io
           repository: quay.io/zuul-ci/zuul-merger
+          namespace: zuul-ci
+          repo_shortname: zuul-merger
+          repo_description: Zuul merger image
           target: zuul-merger
           tags: *imagetag
         - context: .
           registry: quay.io
           repository: quay.io/zuul-ci/zuul-scheduler
+          namespace: zuul-ci
+          repo_shortname: zuul-scheduler
+          repo_description: Zuul scheduler image
           target: zuul-scheduler
           tags: *imagetag
         - context: .
           registry: quay.io
           repository: quay.io/zuul-ci/zuul-web
+          namespace: zuul-ci
+          repo_shortname: zuul-web
+          repo_description: Zuul web image
           target: zuul-web
           tags: *imagetag