diff --git a/.zuul.yaml b/.zuul.yaml
index c123a55..cb4ca55 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -111,7 +111,14 @@
         DEFAULT_IMAGE_NAME: cirros-0.3.4-i386-disk
         ADVANCED_IMAGE_NAME: ubuntu-18.04-server-cloudimg-amd64
         BUILD_TIMEOUT: 784
+        Q_AGENT: openvswitch
+        Q_ML2_TENANT_NETWORK_TYPE: vxlan
+        Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch
       devstack_local_conf:
+        post-config:
+          /$NEUTRON_CORE_PLUGIN_CONF:
+            AGENT:
+              tunnel_types: vxlan,gre
         test-config:
           $TEMPEST_CONFIG:
             taas_plugin_options:
@@ -140,6 +147,15 @@
         n-sch: true
         placement-api: true
         n-api-meta: true
+        # Disable OVN services
+        br-ex-tcpdump: false
+        br-int-flows: false
+        ovn-controller: false
+        ovn-northd: false
+        ovs-vswitchd: false
+        ovsdb-server: false
+        q-ovn-metadata-agent: false
+        # Neutron services
         q-agt: true
         q-dhcp: true
         q-l3: true