diff --git a/.zuul.yaml b/zuul.d/ironic-python-agent-builder-jobs.yaml
similarity index 65%
rename from .zuul.yaml
rename to zuul.d/ironic-python-agent-builder-jobs.yaml
index 9a4b560..baa3e75 100644
--- a/.zuul.yaml
+++ b/zuul.d/ironic-python-agent-builder-jobs.yaml
@@ -124,53 +124,3 @@
     vars:
       image_type: 'dib'
       image_distro: 'ubuntu'
-
-- project:
-    templates:
-      - publish-openstack-docs-pti
-      - check-requirements
-      - release-notes-jobs-python3
-    check:
-      jobs:
-        - openstack-tox-pep8
-        - ironic-standalone-ipa-src
-        - ipa-tempest-partition-bios-ipmi-direct-tinyipa-src
-        - ipa-tempest-partition-bios-ipmi-iscsi-tinyipa-src
-        - ipa-tempest-wholedisk-bios-ipmi-direct-tinyipa-src
-        - ipa-tempest-wholedisk-bios-ipmi-iscsi-tinyipa-src
-        - ironic-python-agent-check-image-tinyipa
-        - ironic-python-agent-check-image-dib-centos8
-        - ironic-python-agent-check-image-dib-centos7
-        # Non-voting jobs
-        - ironic-python-agent-check-image-dib-centos7-python3:
-            voting: false
-        - ironic-python-agent-check-image-dib-fedora:
-            voting: false
-        - ironic-python-agent-check-image-dib-debian:
-            voting: false
-        - ironic-python-agent-check-image-dib-ubuntu:
-            voting: false
-        - ipa-tempest-wholedisk-bios-ipmi-direct-dib-src:
-            voting: false
-        - ipa-tempest-bios-ipmi-iscsi-src:
-            voting: false
-        - ipa-tempest-ironic-inspector-src:
-            voting: false
-        - tripleo-buildimage-ironic-python-agent-centos-8:
-            voting: false
-    gate:
-      jobs:
-        - openstack-tox-pep8
-        - ironic-standalone-ipa-src
-        - ipa-tempest-partition-bios-ipmi-direct-tinyipa-src
-        - ipa-tempest-partition-bios-ipmi-iscsi-tinyipa-src
-        - ipa-tempest-wholedisk-bios-ipmi-direct-tinyipa-src
-        - ipa-tempest-wholedisk-bios-ipmi-iscsi-tinyipa-src
-        - ironic-python-agent-check-image-tinyipa
-        - ironic-python-agent-check-image-dib-centos8
-        - ironic-python-agent-check-image-dib-centos7
-    post:
-      jobs:
-        - publish-openstack-python-branch-tarball
-        - ironic-python-agent-build-image-tinyipa
-        - ironic-python-agent-build-image-dib-centos8
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
new file mode 100644
index 0000000..e7d26c8
--- /dev/null
+++ b/zuul.d/project.yaml
@@ -0,0 +1,49 @@
+- project:
+    templates:
+      - publish-openstack-docs-pti
+      - check-requirements
+      - release-notes-jobs-python3
+    check:
+      jobs:
+        - openstack-tox-pep8
+        - ironic-standalone-ipa-src
+        - ipa-tempest-partition-bios-ipmi-direct-tinyipa-src
+        - ipa-tempest-partition-bios-ipmi-iscsi-tinyipa-src
+        - ipa-tempest-wholedisk-bios-ipmi-direct-tinyipa-src
+        - ipa-tempest-wholedisk-bios-ipmi-iscsi-tinyipa-src
+        - ironic-python-agent-check-image-tinyipa
+        - ironic-python-agent-check-image-dib-centos8
+        - ironic-python-agent-check-image-dib-centos7
+        # Non-voting jobs
+        - ironic-python-agent-check-image-dib-centos7-python3:
+            voting: false
+        - ironic-python-agent-check-image-dib-fedora:
+            voting: false
+        - ironic-python-agent-check-image-dib-debian:
+            voting: false
+        - ironic-python-agent-check-image-dib-ubuntu:
+            voting: false
+        - ipa-tempest-wholedisk-bios-ipmi-direct-dib-src:
+            voting: false
+        - ipa-tempest-bios-ipmi-iscsi-src:
+            voting: false
+        - ipa-tempest-ironic-inspector-src:
+            voting: false
+        - tripleo-buildimage-ironic-python-agent-centos-8:
+            voting: false
+    gate:
+      jobs:
+        - openstack-tox-pep8
+        - ironic-standalone-ipa-src
+        - ipa-tempest-partition-bios-ipmi-direct-tinyipa-src
+        - ipa-tempest-partition-bios-ipmi-iscsi-tinyipa-src
+        - ipa-tempest-wholedisk-bios-ipmi-direct-tinyipa-src
+        - ipa-tempest-wholedisk-bios-ipmi-iscsi-tinyipa-src
+        - ironic-python-agent-check-image-tinyipa
+        - ironic-python-agent-check-image-dib-centos8
+        - ironic-python-agent-check-image-dib-centos7
+    post:
+      jobs:
+        - publish-openstack-python-branch-tarball
+        - ironic-python-agent-build-image-tinyipa
+        - ironic-python-agent-build-image-dib-centos8