diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index bb57bb84d..ff4b529d9 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -13,16 +13,9 @@
 
     check:
       jobs:
-        # - devstack-tobiko-functional-centos
-        - devstack-tobiko-functional-ubuntu
-        # - devstack-tobiko-functional-ovn-centos
-        - devstack-tobiko-functional-ovn-ubuntu
-        # - devstack-tobiko-faults-centos
-        # - devstack-tobiko-faults-ubuntu
-        # - devstack-tobiko-faults-ovn-centos
-        # - devstack-tobiko-faults-ovn-ubuntu
-        # - devstack-tobiko-scenario-ovn-centos
-        - devstack-tobiko-scenario-ovn-ubuntu
+        - devstack-tobiko-faults-ubuntu
+        - devstack-tobiko-gate
+        - devstack-tobiko-gate-ovn
         - tobiko-tox-infrared-centos-7
         - tobiko-tox-infrared-centos-8
         - tobiko-tox-infrared-fedora-latest
@@ -30,27 +23,15 @@
 
     gate:
       jobs:
-        # - devstack-tobiko-functional-centos
-        - devstack-tobiko-functional-ubuntu
-        # - devstack-tobiko-functional-ovn-centos
-        - devstack-tobiko-functional-ovn-ubuntu
-        # - devstack-tobiko-scenario-ovn-centos
-        - devstack-tobiko-scenario-ovn-ubuntu
+        - devstack-tobiko-gate
+        - devstack-tobiko-gate-ovn
         - tobiko-tox-infrared-centos-8
 
     periodic:
       jobs:
+        - devstack-tobiko-gate
+        - devstack-tobiko-gate-ovn
         - tripleo-ci-centos-8-content-provider
-        - devstack-tobiko-functional-centos
-        - devstack-tobiko-functional-ubuntu
-        - devstack-tobiko-functional-ovn-centos
-        - devstack-tobiko-functional-ovn-ubuntu
-        - devstack-tobiko-faults-centos
-        - devstack-tobiko-faults-ubuntu
-        - devstack-tobiko-faults-ovn-centos
-        - devstack-tobiko-faults-ovn-ubuntu
-        - devstack-tobiko-scenario-ovn-centos
-        - devstack-tobiko-scenario-ovn-ubuntu
         - tobiko-tripleo-functional:
             vars: &consumer_vars
               consumer_job: true