diff --git a/.zuul.yaml b/.zuul.yaml
index aa86e08fed..2cd22fc4dc 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -380,8 +380,11 @@
 
 # Gerrit master jobs
 - job:
-    name: system-config-build-image-gerrit-master
-    description: Build a gerrit image.
+    name: system-config-build-image-gerrit-master-base
+    description: |
+      Build a gerrit image.
+
+      This job has no files matchers so it can be used in other repos.
     parent: system-config-build-image
     pre-run:
       - playbooks/zuul/gerrit/repos.yaml
@@ -418,6 +421,14 @@
         - gitiles
         - plugin-manager
         - webhooks
+
+- job:
+    name: system-config-build-image-gerrit-master
+    description: |
+      Build a gerrit image.
+
+      This job is used in system-config.
+    parent: system-config-build-image-gerrit-master-base
     files: &gerrit_files_master
       - docker/bazel/.*
       - docker/gerrit/base/.*