diff --git a/zuul.d/legacy-ironic-jobs.yaml b/zuul.d/legacy-ironic-jobs.yaml
index 0d862d8de..e5e86de55 100644
--- a/zuul.d/legacy-ironic-jobs.yaml
+++ b/zuul.d/legacy-ironic-jobs.yaml
@@ -1,3 +1,27 @@
+- job:
+    name: legacy-ipa-dsvm-base
+    # NOTE: We do not use 'legacy-ironic-dsvm-base' as simpler and less
+    # confusing to define it all here and then use 'legacy-dsvm-base'
+    parent: legacy-dsvm-base
+    irrelevant-files:
+      - ^test-requirements.txt$
+      - ^.*\.rst$
+      - ^doc/.*$
+      - ^ironic_python_agent/tests/.*$
+      - ^releasenotes/.*$
+      - ^setup.cfg$
+      - ^tools/.*$
+      - ^tox.ini$
+    required-projects:
+      - openstack-infra/devstack-gate
+      - openstack/ironic
+      - openstack/ironic-lib
+      - openstack/ironic-python-agent
+      - openstack/pyghmi
+      - openstack/python-ironicclient
+      - openstack/tempest
+      - openstack/virtualbmc
+
 - job:
     name: ironic-python-agent-tox-func
     parent: legacy-base
@@ -9,77 +33,70 @@
 
 - job:
     name: ipa-tempest-dsvm-wholedisk-bios-agent_ipmitool-coreos-src
-    parent: legacy-ironic-dsvm-base
+    parent: legacy-ipa-dsvm-base
     run: playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-agent_ipmitool-coreos-src/run.yaml
     post-run: playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-agent_ipmitool-coreos-src/post.yaml
     timeout: 5400
 
 - job:
     name: ipa-tempest-dsvm-partition-bios-agent_ipmitool-coreos-src
-    parent: legacy-ironic-dsvm-base
+    parent: legacy-ipa-dsvm-base
     run: playbooks/legacy/ipa-tempest-dsvm-partition-bios-agent_ipmitool-coreos-src/run.yaml
     post-run: playbooks/legacy/ipa-tempest-dsvm-partition-bios-agent_ipmitool-coreos-src/post.yaml
     timeout: 5400
 
 - job:
     name: ipa-tempest-dsvm-wholedisk-bios-agent_ipmitool-tinyipa-src
-    parent: legacy-ironic-dsvm-base
+    parent: legacy-ipa-dsvm-base
     run: playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-agent_ipmitool-tinyipa-src/run.yaml
     post-run: playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-agent_ipmitool-tinyipa-src/post.yaml
     timeout: 5400
 
 - job:
     name: ipa-tempest-dsvm-partition-bios-agent_ipmitool-tinyipa-src
-    parent: legacy-ironic-dsvm-base
+    parent: legacy-ipa-dsvm-base
     run: playbooks/legacy/ipa-tempest-dsvm-partition-bios-agent_ipmitool-tinyipa-src/run.yaml
     post-run: playbooks/legacy/ipa-tempest-dsvm-partition-bios-agent_ipmitool-tinyipa-src/post.yaml
     timeout: 5400
 
 - job:
     name: ipa-tempest-dsvm-partition-bios-pxe_ipmitool-tinyipa-src
-    parent: legacy-ironic-dsvm-base
+    parent: legacy-ipa-dsvm-base
     run: playbooks/legacy/ipa-tempest-dsvm-partition-bios-pxe_ipmitool-tinyipa-src/run.yaml
     post-run: playbooks/legacy/ipa-tempest-dsvm-partition-bios-pxe_ipmitool-tinyipa-src/post.yaml
     timeout: 5400
 
 - job:
     name: ipa-tempest-dsvm-wholedisk-bios-pxe_ipmitool-tinyipa-src
-    parent: legacy-ironic-dsvm-base
+    parent: legacy-ipa-dsvm-base
     run: playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-pxe_ipmitool-tinyipa-src/run.yaml
     post-run: playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-pxe_ipmitool-tinyipa-src/post.yaml
     timeout: 5400
 
 - job:
     name: ipa-tempest-dsvm-partition-bios-pxe_ipmitool-coreos-src
-    parent: legacy-ironic-dsvm-base
+    parent: legacy-ipa-dsvm-base
     run: playbooks/legacy/ipa-tempest-dsvm-partition-bios-pxe_ipmitool-coreos-src/run.yaml
     post-run: playbooks/legacy/ipa-tempest-dsvm-partition-bios-pxe_ipmitool-coreos-src/post.yaml
     timeout: 5400
 
 - job:
     name: ipa-tempest-dsvm-wholedisk-bios-pxe_ipmitool-coreos-src
-    parent: legacy-ironic-dsvm-base
+    parent: legacy-ipa-dsvm-base
     run: playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-pxe_ipmitool-coreos-src/run.yaml
     post-run: playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-pxe_ipmitool-coreos-src/post.yaml
     timeout: 5400
 
 - job:
     name: ipa-tempest-dsvm-ironic-inspector-src
-    parent: legacy-ironic-dsvm-base
+    parent: legacy-ipa-dsvm-base
     run: playbooks/legacy/tempest-dsvm-ironic-inspector-src/run.yaml
     post-run: playbooks/legacy/tempest-dsvm-ironic-inspector-src/post.yaml
     timeout: 10800
     required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/ironic
+      # These are in addition to what is in legacy-ipa-dsvm-base
       - openstack/ironic-inspector
-      - openstack/ironic-lib
-      - openstack/ironic-python-agent
-      - openstack/pyghmi
       - openstack/python-ironic-inspector-client
-      - openstack/python-ironicclient
-      - openstack/tempest
-      - openstack/virtualbmc
 
 - job:
     name: ironic-python-agent-buildimage-coreos
@@ -97,14 +114,14 @@
 
 - job:
     name: ipa-tempest-dsvm-partition-bios-pxe_ipmitool-tinyipa256-src
-    parent: legacy-ironic-dsvm-base
+    parent: legacy-ipa-dsvm-base
     run: playbooks/legacy/ipa-tempest-dsvm-partition-bios-pxe_ipmitool-tinyipa256-src/run.yaml
     post-run: playbooks/legacy/ipa-tempest-dsvm-partition-bios-pxe_ipmitool-tinyipa256-src/post.yaml
     timeout: 5400
 
 - job:
     name: ipa-tempest-dsvm-partition-pxe_ipmitool-tinyipa-python3
-    parent: legacy-ironic-dsvm-base
+    parent: legacy-ipa-dsvm-base
     run: playbooks/legacy/ipa-tempest-dsvm-partition-pxe_ipmitool-tinyipa-python3/run.yaml
     post-run: playbooks/legacy/ipa-tempest-dsvm-partition-pxe_ipmitool-tinyipa-python3/post.yaml
     timeout: 5400
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 419d978d6..4b5c4d7ea 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -2,205 +2,33 @@
     name: openstack/ironic-python-agent
     check:
       jobs:
-        - ironic-python-agent-tox-func:
-            voting: false
-        - ipa-tempest-dsvm-wholedisk-bios-agent_ipmitool-coreos-src:
-            irrelevant-files:
-              - ^(test-|)requirements.txt$
-              - ^.*\.rst$
-              - ^doc/.*$
-              - ^ironic_python_agent/tests/.*$
-              - ^releasenotes/.*$
-              - ^setup.cfg$
-              - ^tools/.*$
-              - ^tox.ini$
-        - ipa-tempest-dsvm-partition-bios-agent_ipmitool-coreos-src:
-            irrelevant-files:
-              - ^(test-|)requirements.txt$
-              - ^.*\.rst$
-              - ^doc/.*$
-              - ^ironic_python_agent/tests/.*$
-              - ^releasenotes/.*$
-              - ^setup.cfg$
-              - ^tools/.*$
-              - ^tox.ini$
-        - ipa-tempest-dsvm-wholedisk-bios-agent_ipmitool-tinyipa-src:
-            irrelevant-files:
-              - ^(test-|)requirements.txt$
-              - ^.*\.rst$
-              - ^doc/.*$
-              - ^ironic_python_agent/tests/.*$
-              - ^releasenotes/.*$
-              - ^setup.cfg$
-              - ^tools/.*$
-              - ^tox.ini$
-        - ipa-tempest-dsvm-partition-bios-agent_ipmitool-tinyipa-src:
-            irrelevant-files:
-              - ^(test-|)requirements.txt$
-              - ^.*\.rst$
-              - ^doc/.*$
-              - ^ironic_python_agent/tests/.*$
-              - ^releasenotes/.*$
-              - ^setup.cfg$
-              - ^tools/.*$
-              - ^tox.ini$
-        - ipa-tempest-dsvm-partition-bios-pxe_ipmitool-tinyipa-src:
-            irrelevant-files:
-              - ^(test-|)requirements.txt$
-              - ^.*\.rst$
-              - ^doc/.*$
-              - ^ironic_python_agent/tests/.*$
-              - ^releasenotes/.*$
-              - ^setup.cfg$
-              - ^tools/.*$
-              - ^tox.ini$
-        - ipa-tempest-dsvm-wholedisk-bios-pxe_ipmitool-tinyipa-src:
-            irrelevant-files:
-              - ^(test-|)requirements.txt$
-              - ^.*\.rst$
-              - ^doc/.*$
-              - ^ironic_python_agent/tests/.*$
-              - ^releasenotes/.*$
-              - ^setup.cfg$
-              - ^tools/.*$
-              - ^tox.ini$
-        - ipa-tempest-dsvm-partition-bios-pxe_ipmitool-coreos-src:
-            irrelevant-files:
-              - ^(test-|)requirements.txt$
-              - ^.*\.rst$
-              - ^doc/.*$
-              - ^ironic_python_agent/tests/.*$
-              - ^releasenotes/.*$
-              - ^setup.cfg$
-              - ^tools/.*$
-              - ^tox.ini$
-        - ipa-tempest-dsvm-wholedisk-bios-pxe_ipmitool-coreos-src:
-            irrelevant-files:
-              - ^(test-|)requirements.txt$
-              - ^.*\.rst$
-              - ^doc/.*$
-              - ^ironic_python_agent/tests/.*$
-              - ^releasenotes/.*$
-              - ^setup.cfg$
-              - ^tools/.*$
-              - ^tox.ini$
+        - ipa-tempest-dsvm-partition-bios-agent_ipmitool-coreos-src
+        - ipa-tempest-dsvm-partition-bios-agent_ipmitool-tinyipa-src
+        - ipa-tempest-dsvm-partition-bios-pxe_ipmitool-coreos-src
+        - ipa-tempest-dsvm-partition-bios-pxe_ipmitool-tinyipa-src
+        - ipa-tempest-dsvm-wholedisk-bios-agent_ipmitool-coreos-src
+        - ipa-tempest-dsvm-wholedisk-bios-agent_ipmitool-tinyipa-src
+        - ipa-tempest-dsvm-wholedisk-bios-pxe_ipmitool-coreos-src
+        - ipa-tempest-dsvm-wholedisk-bios-pxe_ipmitool-tinyipa-src
+        # Non-voting jobs
         - ipa-tempest-dsvm-ironic-inspector-src:
             voting: false
-            irrelevant-files:
-              - ^(test-|)requirements.txt$
-              - ^.*\.rst$
-              - ^doc/.*$
-              - ^ironic_python_agent/tests/.*$
-              - ^releasenotes/.*$
-              - ^setup.cfg$
-              - ^tools/.*$
-              - ^tox.ini$
+        - ironic-python-agent-tox-func:
+            voting: false
     gate:
       jobs:
-        - ipa-tempest-dsvm-wholedisk-bios-pxe_ipmitool-coreos-src:
-            irrelevant-files:
-              - ^(test-|)requirements.txt$
-              - ^.*\.rst$
-              - ^doc/.*$
-              - ^ironic_python_agent/tests/.*$
-              - ^releasenotes/.*$
-              - ^setup.cfg$
-              - ^tools/.*$
-              - ^tox.ini$
-        - ipa-tempest-dsvm-wholedisk-bios-pxe_ipmitool-tinyipa-src:
-            irrelevant-files:
-              - ^(test-|)requirements.txt$
-              - ^.*\.rst$
-              - ^doc/.*$
-              - ^ironic_python_agent/tests/.*$
-              - ^releasenotes/.*$
-              - ^setup.cfg$
-              - ^tools/.*$
-              - ^tox.ini$
-        - ipa-tempest-dsvm-wholedisk-bios-agent_ipmitool-coreos-src:
-            irrelevant-files:
-              - ^(test-|)requirements.txt$
-              - ^.*\.rst$
-              - ^doc/.*$
-              - ^ironic_python_agent/tests/.*$
-              - ^releasenotes/.*$
-              - ^setup.cfg$
-              - ^tools/.*$
-              - ^tox.ini$
-        - ipa-tempest-dsvm-wholedisk-bios-agent_ipmitool-tinyipa-src:
-            irrelevant-files:
-              - ^(test-|)requirements.txt$
-              - ^.*\.rst$
-              - ^doc/.*$
-              - ^ironic_python_agent/tests/.*$
-              - ^releasenotes/.*$
-              - ^setup.cfg$
-              - ^tools/.*$
-              - ^tox.ini$
-        - ipa-tempest-dsvm-partition-bios-pxe_ipmitool-tinyipa-src:
-            irrelevant-files:
-              - ^(test-|)requirements.txt$
-              - ^.*\.rst$
-              - ^doc/.*$
-              - ^ironic_python_agent/tests/.*$
-              - ^releasenotes/.*$
-              - ^setup.cfg$
-              - ^tools/.*$
-              - ^tox.ini$
-        - ipa-tempest-dsvm-partition-bios-pxe_ipmitool-coreos-src:
-            irrelevant-files:
-              - ^(test-|)requirements.txt$
-              - ^.*\.rst$
-              - ^doc/.*$
-              - ^ironic_python_agent/tests/.*$
-              - ^releasenotes/.*$
-              - ^setup.cfg$
-              - ^tools/.*$
-              - ^tox.ini$
-        - ipa-tempest-dsvm-partition-bios-agent_ipmitool-coreos-src:
-            irrelevant-files:
-              - ^(test-|)requirements.txt$
-              - ^.*\.rst$
-              - ^doc/.*$
-              - ^ironic_python_agent/tests/.*$
-              - ^releasenotes/.*$
-              - ^setup.cfg$
-              - ^tools/.*$
-              - ^tox.ini$
-        - ipa-tempest-dsvm-partition-bios-agent_ipmitool-tinyipa-src:
-            irrelevant-files:
-              - ^(test-|)requirements.txt$
-              - ^.*\.rst$
-              - ^doc/.*$
-              - ^ironic_python_agent/tests/.*$
-              - ^releasenotes/.*$
-              - ^setup.cfg$
-              - ^tools/.*$
-              - ^tox.ini$
+        - ipa-tempest-dsvm-partition-bios-agent_ipmitool-coreos-src
+        - ipa-tempest-dsvm-partition-bios-agent_ipmitool-tinyipa-src
+        - ipa-tempest-dsvm-partition-bios-pxe_ipmitool-coreos-src
+        - ipa-tempest-dsvm-partition-bios-pxe_ipmitool-tinyipa-src
+        - ipa-tempest-dsvm-wholedisk-bios-agent_ipmitool-coreos-src
+        - ipa-tempest-dsvm-wholedisk-bios-agent_ipmitool-tinyipa-src
+        - ipa-tempest-dsvm-wholedisk-bios-pxe_ipmitool-coreos-src
+        - ipa-tempest-dsvm-wholedisk-bios-pxe_ipmitool-tinyipa-src
     experimental:
       jobs:
-        - ipa-tempest-dsvm-partition-bios-pxe_ipmitool-tinyipa256-src:
-            irrelevant-files:
-              - ^(test-|)requirements.txt$
-              - ^.*\.rst$
-              - ^doc/.*$
-              - ^ironic_python_agent/tests/.*$
-              - ^releasenotes/.*$
-              - ^setup.cfg$
-              - ^tools/.*$
-              - ^tox.ini$
-        - ipa-tempest-dsvm-partition-pxe_ipmitool-tinyipa-python3:
-            voting: false
-            branches: ^(?!stable/(newton|ocata)).*$
-            irrelevant-files:
-              - ^(test-|)requirements.txt$
-              - ^.*\.rst$
-              - ^doc/.*$
-              - ^ironic_python_agent/tests/.*$
-              - ^releasenotes/.*$
-              - ^setup.cfg$
-              - ^tools/.*$
-              - ^tox.ini$
+        - ipa-tempest-dsvm-partition-bios-pxe_ipmitool-tinyipa256-src
+        - ipa-tempest-dsvm-partition-pxe_ipmitool-tinyipa-python3
     post:
       jobs:
         - ironic-python-agent-buildimage-coreos