diff --git a/.zuul.yaml b/.zuul.yaml
index c123a55..2283a92 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -17,13 +17,6 @@
             voting: false
         - tap-as-a-service-tempest-plugin-pike:
             voting: false
-        # NOTE(yamamoto): devstack doesn't have job definition in ocata
-
-        # Non-voting jobs from other projects using this tempest plugin
-        # NOTE(yamamoto): Explicitly marked non-voting here to avoid being
-        # affected by their job definition.
-        - networking-midonet-tempest-aio-ml2-full-centos-7:
-            voting: false
 
 - job:
     name: tap-as-a-service-tempest-plugin
@@ -35,7 +28,7 @@
     required-projects:
       - openstack/devstack-gate
       - openstack/neutron
-      - x/tap-as-a-service
+      - openstack/tap-as-a-service
       - x/tap-as-a-service-tempest-plugin
       - openstack/tempest
     vars:
@@ -111,7 +104,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:
@@ -123,7 +123,7 @@
               api_v2: true
       devstack_plugins:
         neutron: git://opendev.org/openstack/neutron.git
-        tap-as-a-service: git://opendev.org/x/tap-as-a-service.git
+        tap-as-a-service: git://opendev.org/openstack/tap-as-a-service.git
       # tempest_plugins:
       #   - tap-as-a-service-tempest-plugin
       devstack_services:
@@ -140,6 +140,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