diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 69113b4..e9590a2 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -572,6 +572,8 @@
     nodeset:
       nodes: []
 
+# TODO(clean this base job up once we're using -src and -keys and running
+# infra-prod jobs in parallel.
 - job:
     name: opendev-infra-prod-base
     description: |
@@ -588,9 +590,9 @@
 
       This is not for general use.
     abstract: true
-    pre-run:
-      - playbooks/infra-prod/setup-keys.yaml
-      - playbooks/infra-prod/setup-src.yaml
+    # pre.yaml includes setup keys which also dynamically adds the server
+    # to our inventory. Then runs source setup.
+    pre-run: playbooks/infra-prod/pre.yaml
 
 - job:
     name: opendev-infra-prod-setup-keys