diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index ca4468a..70095ea 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -2,7 +2,7 @@
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.2.0
+    rev: v4.3.0
     hooks:
       - id: check-added-large-files
       - id: check-byte-order-marker
diff --git a/playbooks/multinode-setup.yaml b/playbooks/multinode-setup.yaml
index 8afd8a5..36ffece 100644
--- a/playbooks/multinode-setup.yaml
+++ b/playbooks/multinode-setup.yaml
@@ -1,3 +1,4 @@
+---
 - hosts: all
   roles:
     - multi-node-setup
diff --git a/zuul.d/devstack-tobiko-ovs.yaml b/zuul.d/devstack-tobiko-ovs.yaml
index 415c9b6..aca01c4 100644
--- a/zuul.d/devstack-tobiko-ovs.yaml
+++ b/zuul.d/devstack-tobiko-ovs.yaml
@@ -8,14 +8,13 @@
       jobs:
         - devstack-tobiko-ovs
         - devstack-tobiko-ovs-dvr
+        - devstack-tobiko-ovs-dvr-snat
+        - devstack-tobiko-ovs-dvr-no-external
     gate:
       jobs:
         - devstack-tobiko-ovs
-    periodic:
-      jobs:
-        - devstack-tobiko-ovs
-        - devstack-tobiko-ovs-dvr
-        - devstack-tobiko-multinode-ovs
+    periodic: *CHECK
+
 
 # --- STANDALONE -------------------------------------------------------------
 
@@ -88,8 +87,9 @@
     parent: devstack-tobiko-ovs
     description: |
       Base Tobiko devstack job to be used with ML2/OVS and DVR
-    voting: false
+    voting: true
     vars:
+      l3_agent_mode: dvr
       devstack_local_conf:
         post_config:
           $NEUTRON_CONF:
@@ -100,7 +100,7 @@
               availability_zone: nova
           $NEUTRON_L3_CONF:
             DEFAULT:
-              agent_mode: dvr
+              agent_mode: '{{ l3_agent_mode }}'
             agent:
               availability_zone: nova
               debug_iptables_rules: true
@@ -117,6 +117,28 @@
               tunnel_bridge: br-tun
 
 
+- job:
+    name: devstack-tobiko-ovs-dvr-snat
+    parent: devstack-tobiko-ovs-dvr
+    description: |
+      Base Tobiko devstack job to be used with ML2/OVS and dvr_snat L3
+      agent mode
+    voting: true
+    vars:
+      l3_agent_mode: dvr_snat
+
+
+- job:
+    name: devstack-tobiko-ovs-dvr-no-external
+    parent: devstack-tobiko-ovs-dvr
+    description: |
+      Base Tobiko devstack job to be used with ML2/OVS and dvr_no_external L3
+      agent mode
+    voting: true
+    vars:
+      l3_agent_mode: dvr_no_external
+
+
 # --- MULTINODE --------------------------------------------------------------
 
 - job: