diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index bd3c415..2d843fe 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -154,6 +154,24 @@
     abstract: true
 
 
+- job:
+    name: devstack-tobiko-gate
+    parent: devstack-tobiko
+    description: |
+      Tobiko devstack job for gating Tobiko changes.
+    nodeset: openstack-single-node-focal
+    voting: false
+    vars:
+      test_workflow: gate
+    irrelevant-files:
+      - ^.*\.rst$
+      - ^doc/
+      - ^infrared_plugin/
+      - ^releasenotes/
+      - ^report/
+      - ^tobiko/tests/faults/
+
+
 - job:
     name: devstack-tobiko-functional
     parent: devstack-tobiko
@@ -176,7 +194,7 @@
     name: devstack-tobiko-functional-centos
     parent: devstack-tobiko-functional
     nodeset: devstack-single-node-centos-8
-    voting: true
+    voting: false
 
 
 - job:
diff --git a/zuul.d/ovn.yaml b/zuul.d/ovn.yaml
index 7ae24cb..b1d2a8f 100644
--- a/zuul.d/ovn.yaml
+++ b/zuul.d/ovn.yaml
@@ -99,6 +99,18 @@
           tls-proxy: false
 
 
+# --- Gate -------------------------------------------------------------------
+
+- job:
+    name: devstack-tobiko-gate-ovn
+    parent: devstack-tobiko-gate
+    description: |
+      Tobiko devstack job used to gate with OVN
+    voting: true
+    vars:
+      <<: *ovn_base
+
+
 # --- Functional -------------------------------------------------------------
 
 - job:
@@ -114,7 +126,7 @@
     name: devstack-tobiko-functional-ovn-centos
     parent: devstack-tobiko-functional-ovn
     nodeset: devstack-single-node-centos-8
-    voting: true
+    voting: false
 
 - job:
     name: devstack-tobiko-functional-ovn-ubuntu
@@ -136,7 +148,7 @@
     name: devstack-tobiko-scenario-ovn-centos
     parent: devstack-tobiko-scenario-ovn
     nodeset: devstack-single-node-centos-8
-    voting: true
+    voting: false
 
 - job:
     name: devstack-tobiko-scenario-ovn-ubuntu
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index ef6e27a..4dbd77f 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -5,6 +5,8 @@
     check:
       jobs:
         - openstack-tox-linters
+        - devstack-tobiko-gate
+        - devstack-tobiko-gate-ovn
         - devstack-tobiko-functional-centos
         - devstack-tobiko-functional-ubuntu
         - devstack-tobiko-functional-ovn-centos
@@ -19,15 +21,13 @@
     gate:
       jobs:
         - openstack-tox-linters
-        - 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
 
     periodic:
       jobs:
+        - devstack-tobiko-gate
+        - devstack-tobiko-gate-ovn
         - devstack-tobiko-functional-centos
         - devstack-tobiko-functional-ubuntu
         - devstack-tobiko-functional-ovn-centos