diff --git a/zuul.d/job-templates.yaml b/zuul.d/job-templates.yaml
new file mode 100644
index 00000000000..cbd65775c8d
--- /dev/null
+++ b/zuul.d/job-templates.yaml
@@ -0,0 +1,68 @@
+- project-template:
+    name: neutron-tox-override-jobs
+    check:
+      jobs:
+        - openstack-tox-py36:  # from openstack-python3-wallaby-jobs template
+            timeout: 3600
+            irrelevant-files:  &irrelevant-files
+              - ^.*\.conf\.sample$
+              - ^.*\.rst$
+              - ^doc/.*$
+              - ^neutron/locale/.*$
+              - ^neutron/tests/fullstack/.*$
+              - ^neutron/tests/functional/.*$
+              - ^releasenotes/.*$
+              - ^setup.cfg$
+              - ^tools/.*$
+              - ^vagrant/.*$
+              - ^devstack/.*$
+              - ^playbooks/.*$
+              - ^roles/.*$
+              - ^rally-jobs/.*$
+              - ^zuul.d/(?!(job-templates)).*\.yaml
+        - openstack-tox-py38: # from openstack-python3-wallaby-jobs template
+            timeout: 3600
+            irrelevant-files:  *irrelevant-files
+        - openstack-tox-cover:  # from openstack-cover-jobs template
+            timeout: 4800
+            irrelevant-files:  *irrelevant-files
+    gate:
+      jobs:
+        - openstack-tox-py36:  # from openstack-python3-wallaby-jobs template
+            timeout: 3600
+            irrelevant-files:  *irrelevant-files
+
+- project-template:
+    name: neutron-experimental-jobs
+    experimental:
+      jobs:
+        - neutron-functional-with-uwsgi-fips
+        - neutron-fullstack-with-uwsgi-fips
+        - neutron-grenade-ovn
+        - neutron-tempest-with-uwsgi-loki
+
+- project-template:
+    name: neutron-periodic-jobs
+    periodic:
+      jobs:
+        - neutron-functional
+        - neutron-fullstack
+        - neutron-tempest-postgres-full
+        - neutron-tempest-mariadb-full
+        - devstack-tobiko-neutron:
+            voting: true
+        - ironic-tempest-ipa-wholedisk-bios-agent_ipmitool-tinyipa
+        - openstacksdk-functional-devstack-networking
+        - tripleo-ci-centos-8-content-provider
+        - neutron-centos-8-tripleo-standalone:
+            voting: true
+            vars: &consumer_vars
+              consumer_job: true
+              build_container_images: false
+              remove_tags:
+                - build
+            dependencies: &consumer_deps
+              - tripleo-ci-centos-8-content-provider
+        - neutron-ovn-tripleo-ci-centos-8-containers-multinode:
+            vars: *consumer_vars
+            dependencies: *consumer_deps
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index d42ed3ce2a0..7be511b18af 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -12,6 +12,9 @@
       - periodic-stable-jobs
       - check-requirements
       - release-notes-jobs-python3
+      - neutron-experimental-jobs
+      - neutron-periodic-jobs
+      - neutron-tox-override-jobs
     check:
       jobs:
         - neutron-functional-with-uwsgi
@@ -35,19 +38,6 @@
         #    voting: false
         - neutron-ovn-rally-task:
             voting: false
-        # TripleO jobs that deploy OVN.
-        # Note we don't use a project-template here, so it's easier
-        # to disable voting on one specific job if things go wrong.
-        # In Stein and beyond, fs010 will run using
-        # networking-ovn-tripleo-ci-centos-7-containers-multinode.
-        # If you need any support to debug these jobs in case of
-        # failures, please reach us on #tripleo IRC channel.
-        - openstack-tox-py36:  # from openstack-python3-wallaby-jobs template
-            timeout: 3600
-        - openstack-tox-py38:  # from openstack-python3-wallaby-jobs template
-            timeout: 3600
-        - openstack-tox-cover:  # from openstack-cover-jobs template
-            timeout: 4800
         - neutron-ovn-tempest-slow
     gate:
       jobs:
@@ -63,39 +53,6 @@
         - neutron-tempest-ipv6-only
         - neutron-ovn-tempest-ovs-release
         - neutron-ovn-tempest-ovs-release-ipv6-only
-        - openstack-tox-py36:  # from openstack-python3-wallaby-jobs template
-            timeout: 3600
         - neutron-ovn-tempest-slow
         #- neutron-ovn-rally-task
         #- neutron-ovn-tripleo-ci-centos-8-containers-multinode
-
-    experimental:
-      jobs:
-        - neutron-functional-with-uwsgi-fips
-        - neutron-fullstack-with-uwsgi-fips
-        - neutron-grenade-ovn
-        - neutron-tempest-with-uwsgi-loki
-
-    periodic:
-      jobs:
-        - neutron-functional
-        - neutron-fullstack
-        - neutron-tempest-postgres-full
-        - neutron-tempest-mariadb-full
-        - devstack-tobiko-neutron:
-            voting: true
-        - ironic-tempest-ipa-wholedisk-bios-agent_ipmitool-tinyipa
-        - openstacksdk-functional-devstack-networking
-        - tripleo-ci-centos-8-content-provider
-        - neutron-centos-8-tripleo-standalone:
-            voting: true
-            vars: &consumer_vars
-              consumer_job: true
-              build_container_images: false
-              remove_tags:
-                - build
-            dependencies: &consumer_deps
-              - tripleo-ci-centos-8-content-provider
-        - neutron-ovn-tripleo-ci-centos-8-containers-multinode:
-            vars: *consumer_vars
-            dependencies: *consumer_deps