diff --git a/playbooks/kayobe-overcloud-base/post.yml b/playbooks/kayobe-base/post.yml
similarity index 61%
rename from playbooks/kayobe-overcloud-base/post.yml
rename to playbooks/kayobe-base/post.yml
index 9faa60fa4..124269ca5 100644
--- a/playbooks/kayobe-overcloud-base/post.yml
+++ b/playbooks/kayobe-base/post.yml
@@ -4,5 +4,6 @@
     - role: kayobe-diagnostics
       kayobe_diagnostics_phase: "post"
       kayobe_diagnostics_log_dir: "/tmp/logs"
-      kayobe_diagnostics_config_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/x/kayobe-config-dev'].src_dir }}"
+      kayobe_diagnostics_config_dir: "{{ kayobe_config_src_dir }}"
+      kayobe_diagnostics_previous_config_dir: "{{ previous_kayobe_config_src_dir }}"
       kayobe_diagnostics_executor_log_dir: "{{ zuul.executor.log_root }}/{{ inventory_hostname }}"
diff --git a/playbooks/kayobe-base/pre.yml b/playbooks/kayobe-base/pre.yml
new file mode 100644
index 000000000..f90db4a1c
--- /dev/null
+++ b/playbooks/kayobe-base/pre.yml
@@ -0,0 +1,17 @@
+---
+- hosts: primary
+  roles:
+    - role: kayobe-diagnostics
+      kayobe_diagnostics_phase: "pre"
+      kayobe_diagnostics_log_dir: "{{ logs_dir }}"
+
+    - role: kayobe-ci-prep
+  tasks:
+    # NOTE(mgoddard): Copying upper constraints to somewhere accessible by both
+    # the zuul and stack users.
+    - name: Ensure upper-contraints.txt exists
+      copy:
+        src: "{{ requirements_src_dir }}/upper-constraints.txt"
+        dest: "/tmp"
+        mode: 0644
+        remote_src: true
diff --git a/playbooks/kayobe-overcloud-base/pre.yml b/playbooks/kayobe-overcloud-base/pre.yml
index ae07d2a72..f6d09b8a1 100644
--- a/playbooks/kayobe-overcloud-base/pre.yml
+++ b/playbooks/kayobe-overcloud-base/pre.yml
@@ -1,27 +1,8 @@
 ---
 - hosts: primary
-  vars:
-    logs_dir: "/tmp/logs"
-    kayobe_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/x/kayobe'].src_dir }}"
-    kayobe_config_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/x/kayobe-config-dev'].src_dir }}"
   environment:
     KAYOBE_CONFIG_SOURCE_PATH: "{{ kayobe_config_src_dir }}"
-  roles:
-    - role: kayobe-diagnostics
-      kayobe_diagnostics_phase: "pre"
-      kayobe_diagnostics_log_dir: "{{ logs_dir }}"
-
-    - role: kayobe-ci-prep
   tasks:
-    # NOTE(mgoddard): Copying upper constraints to somewhere accessible by both
-    # the zuul and stack users.
-    - name: Ensure upper-contraints.txt exists
-      copy:
-        src: "{{ zuul.projects['opendev.org/openstack/requirements'].src_dir ~ '/upper-constraints.txt' }}"
-        dest: "/tmp"
-        mode: 0644
-        remote_src: true
-
     # NOTE(mgoddard): Use the name zz-overrides.yml to ensure this takes
     # precedence over the standard config files.
     - name: Ensure kayobe-config override config file exists
diff --git a/playbooks/kayobe-overcloud-base/run.yml b/playbooks/kayobe-overcloud-base/run.yml
index 6ddc0cee7..483195fee 100644
--- a/playbooks/kayobe-overcloud-base/run.yml
+++ b/playbooks/kayobe-overcloud-base/run.yml
@@ -1,10 +1,5 @@
 ---
 - hosts: primary
-  vars:
-    kayobe_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/x/kayobe'].src_dir }}"
-    kayobe_config_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/x/kayobe-config-dev'].src_dir }}"
-    logs_dir: "/tmp/logs"
-    tenks_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/tenks'].src_dir }}"
   environment:
     KAYOBE_CONFIG_SOURCE_PATH: "{{ kayobe_config_src_dir }}"
   tasks:
diff --git a/playbooks/kayobe-overcloud-upgrade-base/post.yml b/playbooks/kayobe-overcloud-upgrade-base/post.yml
deleted file mode 100644
index 8ec489586..000000000
--- a/playbooks/kayobe-overcloud-upgrade-base/post.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-- hosts: all
-  roles:
-    - role: kayobe-diagnostics
-      kayobe_diagnostics_phase: "post"
-      kayobe_diagnostics_log_dir: "/tmp/logs"
-      kayobe_diagnostics_config_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/x/kayobe-config-dev'].src_dir }}"
-      kayobe_diagnostics_previous_config_dir: "{{ ansible_env.PWD ~ '/previous/kayobe-config' }}"
-      kayobe_diagnostics_executor_log_dir: "{{ zuul.executor.log_root }}/{{ inventory_hostname }}"
diff --git a/playbooks/kayobe-overcloud-upgrade-base/pre.yml b/playbooks/kayobe-overcloud-upgrade-base/pre.yml
index 1923f0663..0d188107a 100644
--- a/playbooks/kayobe-overcloud-upgrade-base/pre.yml
+++ b/playbooks/kayobe-overcloud-upgrade-base/pre.yml
@@ -1,27 +1,6 @@
 ---
 - hosts: primary
-  vars:
-    logs_dir: "/tmp/logs"
-    kayobe_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/x/kayobe'].src_dir }}"
-    kayobe_config_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/x/kayobe-config-dev'].src_dir }}"
-    previous_kayobe_src_dir: "{{ ansible_env.PWD ~ '/previous/kayobe' }}"
-    previous_kayobe_config_src_dir: "{{ ansible_env.PWD ~ '/previous/kayobe-config' }}"
-  roles:
-    - role: kayobe-diagnostics
-      kayobe_diagnostics_phase: "pre"
-      kayobe_diagnostics_log_dir: "{{ logs_dir }}"
-
-    - role: kayobe-ci-prep
   tasks:
-    # NOTE(mgoddard): Copying upper constraints to somewhere accessible by both
-    # the zuul and stack users.
-    - name: Ensure upper-contraints.txt exists
-      copy:
-        src: "{{ zuul.projects['opendev.org/openstack/requirements'].src_dir ~ '/upper-constraints.txt' }}"
-        dest: "/tmp"
-        mode: 0644
-        remote_src: true
-
     - name: Ensure previous kayobe directory exists
       file:
         path: "{{ previous_kayobe_src_dir }}"
diff --git a/playbooks/kayobe-overcloud-upgrade-base/run.yml b/playbooks/kayobe-overcloud-upgrade-base/run.yml
index 4c122db30..db03447b5 100644
--- a/playbooks/kayobe-overcloud-upgrade-base/run.yml
+++ b/playbooks/kayobe-overcloud-upgrade-base/run.yml
@@ -1,12 +1,5 @@
 ---
 - hosts: primary
-  vars:
-    kayobe_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/x/kayobe'].src_dir }}"
-    kayobe_config_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/x/kayobe-config-dev'].src_dir }}"
-    previous_kayobe_src_dir: "{{ ansible_env.PWD ~ '/previous/kayobe' }}"
-    previous_kayobe_config_src_dir: "{{ ansible_env.PWD ~ '/previous/kayobe-config' }}"
-    logs_dir: "/tmp/logs"
-    tenks_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/tenks'].src_dir }}"
   tasks:
 
     # Install the previous release of Kayobe, and use it to deploy a control
diff --git a/playbooks/kayobe-seed-base/post.yml b/playbooks/kayobe-seed-base/post.yml
deleted file mode 100644
index 9faa60fa4..000000000
--- a/playbooks/kayobe-seed-base/post.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- hosts: all
-  roles:
-    - role: kayobe-diagnostics
-      kayobe_diagnostics_phase: "post"
-      kayobe_diagnostics_log_dir: "/tmp/logs"
-      kayobe_diagnostics_config_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/x/kayobe-config-dev'].src_dir }}"
-      kayobe_diagnostics_executor_log_dir: "{{ zuul.executor.log_root }}/{{ inventory_hostname }}"
diff --git a/playbooks/kayobe-seed-base/pre.yml b/playbooks/kayobe-seed-base/pre.yml
index 1e58fb8d5..291fa90a3 100644
--- a/playbooks/kayobe-seed-base/pre.yml
+++ b/playbooks/kayobe-seed-base/pre.yml
@@ -1,27 +1,8 @@
 ---
 - hosts: primary
-  vars:
-    logs_dir: "/tmp/logs"
-    kayobe_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/x/kayobe'].src_dir }}"
-    kayobe_config_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/x/kayobe-config-dev'].src_dir }}"
   environment:
     KAYOBE_CONFIG_SOURCE_PATH: "{{ kayobe_config_src_dir }}"
-  roles:
-    - role: kayobe-diagnostics
-      kayobe_diagnostics_phase: "pre"
-      kayobe_diagnostics_log_dir: "{{ logs_dir }}"
-
-    - role: kayobe-ci-prep
   tasks:
-    # NOTE(mgoddard): Copying upper constraints to somewhere accessible by both
-    # the zuul and stack users.
-    - name: Ensure upper-contraints.txt exists
-      copy:
-        src: "{{ zuul.projects['opendev.org/openstack/requirements'].src_dir ~ '/upper-constraints.txt' }}"
-        dest: "/tmp"
-        mode: 0644
-        remote_src: true
-
     # NOTE(mgoddard): Use the name zz-overrides.yml to ensure this takes
     # precedence over the standard config files.
     - name: Ensure kayobe-config override config file exists
diff --git a/playbooks/kayobe-seed-base/run.yml b/playbooks/kayobe-seed-base/run.yml
index d4b1fb779..49ad6e986 100644
--- a/playbooks/kayobe-seed-base/run.yml
+++ b/playbooks/kayobe-seed-base/run.yml
@@ -1,9 +1,5 @@
 ---
 - hosts: primary
-  vars:
-    kayobe_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/x/kayobe'].src_dir }}"
-    kayobe_config_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/x/kayobe-config-dev'].src_dir }}"
-    logs_dir: "/tmp/logs"
   environment:
     KAYOBE_CONFIG_SOURCE_PATH: "{{ kayobe_config_src_dir }}"
     # Don't provision a seed VM - use the Zuul VM as the seed host.
diff --git a/playbooks/kayobe-seed-upgrade-base/post.yml b/playbooks/kayobe-seed-upgrade-base/post.yml
deleted file mode 100644
index 8ec489586..000000000
--- a/playbooks/kayobe-seed-upgrade-base/post.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-- hosts: all
-  roles:
-    - role: kayobe-diagnostics
-      kayobe_diagnostics_phase: "post"
-      kayobe_diagnostics_log_dir: "/tmp/logs"
-      kayobe_diagnostics_config_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/x/kayobe-config-dev'].src_dir }}"
-      kayobe_diagnostics_previous_config_dir: "{{ ansible_env.PWD ~ '/previous/kayobe-config' }}"
-      kayobe_diagnostics_executor_log_dir: "{{ zuul.executor.log_root }}/{{ inventory_hostname }}"
diff --git a/playbooks/kayobe-seed-upgrade-base/pre.yml b/playbooks/kayobe-seed-upgrade-base/pre.yml
index bc9a81b23..9effcf5aa 100644
--- a/playbooks/kayobe-seed-upgrade-base/pre.yml
+++ b/playbooks/kayobe-seed-upgrade-base/pre.yml
@@ -1,25 +1,6 @@
 ---
 - hosts: primary
-  vars:
-    logs_dir: "/tmp/logs"
-    previous_kayobe_src_dir: "{{ ansible_env.PWD ~ '/previous/kayobe' }}"
-    previous_kayobe_config_src_dir: "{{ ansible_env.PWD ~ '/previous/kayobe-config' }}"
-  roles:
-    - role: kayobe-diagnostics
-      kayobe_diagnostics_phase: "pre"
-      kayobe_diagnostics_log_dir: "{{ logs_dir }}"
-
-    - role: kayobe-ci-prep
   tasks:
-    # NOTE(mgoddard): Copying upper constraints to somewhere accessible by both
-    # the zuul and stack users.
-    - name: Ensure upper-contraints.txt exists
-      copy:
-        src: "{{ zuul.projects['opendev.org/openstack/requirements'].src_dir ~ '/upper-constraints.txt' }}"
-        dest: "/tmp"
-        mode: 0644
-        remote_src: true
-
     - name: Ensure previous kayobe directory exists
       file:
         path: "{{ previous_kayobe_src_dir }}"
diff --git a/playbooks/kayobe-seed-upgrade-base/run.yml b/playbooks/kayobe-seed-upgrade-base/run.yml
index 41b26e20b..be308188d 100644
--- a/playbooks/kayobe-seed-upgrade-base/run.yml
+++ b/playbooks/kayobe-seed-upgrade-base/run.yml
@@ -1,11 +1,5 @@
 ---
 - hosts: primary
-  vars:
-    kayobe_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/x/kayobe'].src_dir }}"
-    kayobe_config_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/x/kayobe-config-dev'].src_dir }}"
-    previous_kayobe_src_dir: "{{ ansible_env.PWD ~ '/previous/kayobe' }}"
-    previous_kayobe_config_src_dir: "{{ ansible_env.PWD ~ '/previous/kayobe-config' }}"
-    logs_dir: "/tmp/logs"
   tasks:
 
     # Install the previous release of Kayobe, and use it to deploy a control
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 39c5cd8eb..da9e71f28 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -47,16 +47,12 @@
       - ^setup.cfg$
 
 - job:
-    name: kayobe-overcloud-base
+    name: kayobe-base
     description: |
-      Base job for testing overcloud deployment.
-
-      Configures the primary VM as an overcloud controller.
-    pre-run: playbooks/kayobe-overcloud-base/pre.yml
-    run: playbooks/kayobe-overcloud-base/run.yml
-    post-run: playbooks/kayobe-overcloud-base/post.yml
+      Base job for all deployment jobs.
+    pre-run: playbooks/kayobe-base/pre.yml
+    post-run: playbooks/kayobe-base/post.yml
     attempts: 1
-    timeout: 7200
     required-projects:
       # Include kayobe to ensure other projects can use this job.
       - name: x/kayobe
@@ -72,6 +68,27 @@
       - ^setup.cfg$
       - ^tools/.*$
       - ^tox.ini$
+    vars:
+      # Name of the release to upgrade from for upgrade jobs.
+      previous_release: rocky
+      logs_dir: "/tmp/logs"
+      kayobe_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/x/kayobe'].src_dir }}"
+      kayobe_config_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/x/kayobe-config-dev'].src_dir }}"
+      previous_kayobe_src_dir: "{{ ansible_env.PWD ~ '/previous/kayobe' }}"
+      previous_kayobe_config_src_dir: "{{ ansible_env.PWD ~ '/previous/kayobe-config' }}"
+      requirements_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/requirements'].src_dir }}"
+      tenks_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/tenks'].src_dir }}"
+
+- job:
+    name: kayobe-overcloud-base
+    parent: kayobe-base
+    description: |
+      Base job for testing overcloud deployment.
+
+      Configures the primary VM as an overcloud controller.
+    pre-run: playbooks/kayobe-overcloud-base/pre.yml
+    run: playbooks/kayobe-overcloud-base/run.yml
+    timeout: 7200
 
 - job:
     name: kayobe-overcloud-centos
@@ -80,6 +97,7 @@
 
 - job:
     name: kayobe-overcloud-upgrade-base
+    parent: kayobe-base
     description: |
       Base job for testing overcloud upgrades.
 
@@ -87,27 +105,7 @@
       OpenStack release, and upgrades it to the current release.
     pre-run: playbooks/kayobe-overcloud-upgrade-base/pre.yml
     run: playbooks/kayobe-overcloud-upgrade-base/run.yml
-    post-run: playbooks/kayobe-overcloud-upgrade-base/post.yml
-    attempts: 1
     timeout: 9000
-    required-projects:
-      # Include kayobe to ensure other projects can use this job.
-      - name: x/kayobe
-      - name: x/kayobe-config-dev
-      - name: openstack/kolla
-      - name: openstack/kolla-ansible
-      - name: openstack/requirements
-      - name: openstack/tenks
-    vars:
-      # Name of the release to upgrade from.
-      previous_release: rocky
-    irrelevant-files:
-      - ^.*\.rst$
-      - ^doc/.*
-      - ^releasenotes/.*
-      - ^setup.cfg$
-      - ^tools/.*$
-      - ^tox.ini$
 
 - job:
     name: kayobe-overcloud-upgrade-centos
@@ -116,29 +114,14 @@
 
 - job:
     name: kayobe-seed-base
+    parent: kayobe-base
     description: |
       Base job for testing seed deployment.
 
       Configures the primary VM as a seed.
     pre-run: playbooks/kayobe-seed-base/pre.yml
     run: playbooks/kayobe-seed-base/run.yml
-    post-run: playbooks/kayobe-seed-base/post.yml
-    attempts: 1
     timeout: 5400
-    required-projects:
-      # Include kayobe to ensure other projects can use this job.
-      - name: x/kayobe
-      - name: x/kayobe-config-dev
-      - name: openstack/kolla
-      - name: openstack/kolla-ansible
-      - name: openstack/requirements
-    irrelevant-files:
-      - ^.*\.rst$
-      - ^doc/.*
-      - ^releasenotes/.*
-      - ^setup.cfg$
-      - ^tools/.*$
-      - ^tox.ini$
 
 - job:
     name: kayobe-seed-centos
@@ -147,6 +130,7 @@
 
 - job:
     name: kayobe-seed-upgrade-base
+    parent: kayobe-base
     description: |
       Base job for testing seed upgrades.
 
@@ -154,26 +138,7 @@
       and upgrades it to the current release.
     pre-run: playbooks/kayobe-seed-upgrade-base/pre.yml
     run: playbooks/kayobe-seed-upgrade-base/run.yml
-    post-run: playbooks/kayobe-seed-upgrade-base/post.yml
-    attempts: 1
     timeout: 5400
-    required-projects:
-      # Include kayobe to ensure other projects can use this job.
-      - name: x/kayobe
-      - name: x/kayobe-config-dev
-      - name: openstack/kolla
-      - name: openstack/kolla-ansible
-      - name: openstack/requirements
-    vars:
-      # Name of the release to upgrade from.
-      previous_release: rocky
-    irrelevant-files:
-      - ^.*\.rst$
-      - ^doc/.*
-      - ^releasenotes/.*
-      - ^setup.cfg$
-      - ^tools/.*$
-      - ^tox.ini$
 
 - job:
     name: kayobe-seed-upgrade-centos