diff --git a/zuul.d/legacy-bifrost-jobs.yaml b/zuul.d/legacy-bifrost-jobs.yaml
index 1da46961a..f1b7586a0 100644
--- a/zuul.d/legacy-bifrost-jobs.yaml
+++ b/zuul.d/legacy-bifrost-jobs.yaml
@@ -1,12 +1,17 @@
 - job:
-    name: bifrost-integration-dhcp
+    name: bifrost-base
     parent: legacy-base
-    run: playbooks/legacy/bifrost-integration-dhcp/run.yaml
-    post-run: playbooks/legacy/bifrost-integration-dhcp/post.yaml
-    timeout: 7200
+    irrelevant-files:
+      - ^.*\.rst$
+      - ^bifrost/tests/.*$
+      - ^doc/.*$
+      - ^releasenotes/.*$
+      - ^setup.cfg$
+      - ^test-requirements.txt$
+      - ^tools/.*$
+      - ^tox.ini$
     required-projects:
       - openstack/bifrost
-      - openstack/diskimage-builder
       - openstack/ironic
       - openstack/ironic-inspector
       - openstack/python-ironic-inspector-client
@@ -14,133 +19,78 @@
       - openstack/requirements
       - openstack-infra/shade
 
+- job:
+    name: bifrost-integration
+    parent: bifrost-base
+    required-projects:
+      # this is in addition to bifrost-base's required-projects
+      - openstack/diskimage-builder
+
+- job:
+    name: bifrost-integration-dhcp
+    parent: bifrost-integration
+    run: playbooks/legacy/bifrost-integration-dhcp/run.yaml
+    post-run: playbooks/legacy/bifrost-integration-dhcp/post.yaml
+    timeout: 7200
+
 - job:
     name: bifrost-integration-dhcp-centos-7
-    parent: legacy-base
+    parent: bifrost-integration
     run: playbooks/legacy/bifrost-integration-dhcp-centos-7/run.yaml
     post-run: playbooks/legacy/bifrost-integration-dhcp-centos-7/post.yaml
     timeout: 7200
     nodeset: legacy-centos-7
-    required-projects:
-      - openstack/bifrost
-      - openstack/diskimage-builder
-      - openstack/ironic
-      - openstack/ironic-inspector
-      - openstack/python-ironic-inspector-client
-      - openstack/python-ironicclient
-      - openstack/requirements
-      - openstack-infra/shade
 
 - job:
     name: bifrost-integration-dhcp-opensuse-423
-    parent: legacy-base
+    parent: bifrost-integration
     run: playbooks/legacy/bifrost-integration-dhcp-opensuse-423/run.yaml
     post-run: playbooks/legacy/bifrost-integration-dhcp-opensuse-423/post.yaml
     timeout: 7200
     nodeset: legacy-opensuse-423
-    required-projects:
-      - openstack/bifrost
-      - openstack/diskimage-builder
-      - openstack/ironic
-      - openstack/ironic-inspector
-      - openstack/python-ironic-inspector-client
-      - openstack/python-ironicclient
-      - openstack/requirements
-      - openstack-infra/shade
 
 - job:
     name: bifrost-integration-dibipa-debian
-    parent: legacy-base
+    parent: bifrost-integration
     run: playbooks/legacy/bifrost-integration-dibipa-debian/run.yaml
     post-run: playbooks/legacy/bifrost-integration-dibipa-debian/post.yaml
     timeout: 7200
-    required-projects:
-      - openstack/bifrost
-      - openstack/diskimage-builder
-      - openstack/ironic
-      - openstack/ironic-inspector
-      - openstack/python-ironic-inspector-client
-      - openstack/python-ironicclient
-      - openstack/requirements
-      - openstack-infra/shade
 
 - job:
     name: bifrost-integration-dibipa-debian-centos-7
-    parent: legacy-base
+    parent: bifrost-integration
     run: playbooks/legacy/bifrost-integration-dibipa-debian-centos-7/run.yaml
     post-run: playbooks/legacy/bifrost-integration-dibipa-debian-centos-7/post.yaml
     timeout: 7200
     nodeset: legacy-centos-7
-    required-projects:
-      - openstack/bifrost
-      - openstack/diskimage-builder
-      - openstack/ironic
-      - openstack/ironic-inspector
-      - openstack/python-ironic-inspector-client
-      - openstack/python-ironicclient
-      - openstack/requirements
-      - openstack-infra/shade
 
 - job:
     name: bifrost-integration-dibipa-debian-opensuse-423
-    parent: legacy-base
+    parent: bifrost-integration
     run: playbooks/legacy/bifrost-integration-dibipa-debian-opensuse-423/run.yaml
     post-run: playbooks/legacy/bifrost-integration-dibipa-debian-opensuse-423/post.yaml
     timeout: 7200
     nodeset: legacy-opensuse-423
-    required-projects:
-      - openstack/bifrost
-      - openstack/diskimage-builder
-      - openstack/ironic
-      - openstack/ironic-inspector
-      - openstack/python-ironic-inspector-client
-      - openstack/python-ironicclient
-      - openstack/requirements
-      - openstack-infra/shade
 
 - job:
     name: bifrost-integration-tinyipa
-    parent: legacy-base
+    parent: bifrost-base
     run: playbooks/legacy/bifrost-integration-tinyipa/run.yaml
     post-run: playbooks/legacy/bifrost-integration-tinyipa/post.yaml
     timeout: 3600
-    required-projects:
-      - openstack/bifrost
-      - openstack/ironic
-      - openstack/ironic-inspector
-      - openstack/python-ironic-inspector-client
-      - openstack/python-ironicclient
-      - openstack/requirements
-      - openstack-infra/shade
 
 - job:
     name: bifrost-integration-tinyipa-centos-7
-    parent: legacy-base
+    parent: bifrost-base
     run: playbooks/legacy/bifrost-integration-tinyipa-centos-7/run.yaml
     post-run: playbooks/legacy/bifrost-integration-tinyipa-centos-7/post.yaml
     timeout: 3600
     nodeset: legacy-centos-7
-    required-projects:
-      - openstack/bifrost
-      - openstack/ironic
-      - openstack/ironic-inspector
-      - openstack/python-ironic-inspector-client
-      - openstack/python-ironicclient
-      - openstack/requirements
-      - openstack-infra/shade
 
 - job:
     name: bifrost-integration-tinyipa-opensuse-423
-    parent: legacy-base
+    parent: bifrost-base
     run: playbooks/legacy/bifrost-integration-tinyipa-opensuse-423/run.yaml
     post-run: playbooks/legacy/bifrost-integration-tinyipa-opensuse-423/post.yaml
     timeout: 3600
     nodeset: legacy-opensuse-423
-    required-projects:
-      - openstack/bifrost
-      - openstack/ironic
-      - openstack/ironic-inspector
-      - openstack/python-ironic-inspector-client
-      - openstack/python-ironicclient
-      - openstack/requirements
-      - openstack-infra/shade
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 82771053d..c535e3aac 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -1,76 +1,25 @@
 - project:
     name: openstack/bifrost
-
-    experimental:
-      jobs:
-        - bifrost-integration-tinyipa-opensuse-423:
-            irrelevant-files:
-              - ^.*\.rst$
-              - ^doc/.*$
-              - ^releasenotes/.*$
     check:
       jobs:
-        - bifrost-integration-tinyipa-centos-7:
-            voting: false
-            irrelevant-files:
-              - ^.*\.rst$
-              - ^doc/.*$
-              - ^releasenotes/.*$
-        - bifrost-integration-dibipa-debian-centos-7:
-            voting: false
-            irrelevant-files:
-              - ^.*\.rst$
-              - ^doc/.*$
-              - ^releasenotes/.*$
-        - bifrost-integration-tinyipa:
-            irrelevant-files:
-              - ^.*\.rst$
-              - ^doc/.*$
-              - ^releasenotes/.*$
-        - bifrost-integration-tinyipa-opensuse-423:
-            irrelevant-files:
-              - ^.*\.rst$
-              - ^doc/.*$
-              - ^releasenotes/.*$
-        - bifrost-integration-dibipa-debian:
-            voting: false
-            irrelevant-files:
-              - ^.*\.rst$
-              - ^doc/.*$
-              - ^releasenotes/.*$
-        - bifrost-integration-dibipa-debian-opensuse-423:
-            voting: false
-            irrelevant-files:
-              - ^.*\.rst$
-              - ^doc/.*$
-              - ^releasenotes/.*$
+        - bifrost-integration-tinyipa
+        - bifrost-integration-tinyipa-opensuse-423
+        # Non-voting jobs
         - bifrost-integration-dhcp:
             voting: false
-            irrelevant-files:
-              - ^.*\.rst$
-              - ^doc/.*$
-              - ^releasenotes/.*$
         - bifrost-integration-dhcp-opensuse-423:
             voting: false
-            irrelevant-files:
-              - ^.*\.rst$
-              - ^doc/.*$
-              - ^releasenotes/.*$
         - bifrost-integration-dhcp-centos-7:
             voting: false
-            irrelevant-files:
-              - ^.*\.rst$
-              - ^doc/.*$
-              - ^releasenotes/.*$
+        - bifrost-integration-dibipa-debian-centos-7:
+            voting: false
+        - bifrost-integration-dibipa-debian:
+            voting: false
+        - bifrost-integration-dibipa-debian-opensuse-423:
+            voting: false
+        - bifrost-integration-tinyipa-centos-7:
+            voting: false
     gate:
       jobs:
-        - bifrost-integration-tinyipa:
-            irrelevant-files:
-              - ^.*\.rst$
-              - ^doc/.*$
-              - ^releasenotes/.*$
-        - bifrost-integration-tinyipa-opensuse-423:
-            irrelevant-files:
-              - ^.*\.rst$
-              - ^doc/.*$
-              - ^releasenotes/.*$
+        - bifrost-integration-tinyipa
+        - bifrost-integration-tinyipa-opensuse-423