diff --git a/.zuul.yaml b/.zuul.yaml
index 99be9ee2..a8321f48 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,11 +1,25 @@
+- job:
+    name: os-vif-ovs
+    parent: legacy-dsvm-base
+    run: playbooks/os-vif-ovs/run.yaml
+    post-run: playbooks/os-vif-ovs/post.yaml
+    timeout: 7800
+    required-projects:
+      - openstack-infra/devstack-gate
+      - openstack/nova
+      - openstack/os-vif
+      - openstack/tempest
+
 - project:
     check:
       jobs:
         - openstack-tox-functional-with-sudo
         - kuryr-kubernetes-tempest-daemon-octavia
         - openstack-tox-lower-constraints
+        - os-vif-ovs
     gate:
       jobs:
         - openstack-tox-functional-with-sudo
         - kuryr-kubernetes-tempest-daemon-octavia
         - openstack-tox-lower-constraints
+        - os-vif-ovs
diff --git a/playbooks/os-vif-ovs/post.yaml b/playbooks/os-vif-ovs/post.yaml
new file mode 100644
index 00000000..e07f5510
--- /dev/null
+++ b/playbooks/os-vif-ovs/post.yaml
@@ -0,0 +1,15 @@
+- hosts: primary
+  tasks:
+
+    - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
+      synchronize:
+        src: '{{ ansible_user_dir }}/workspace/'
+        dest: '{{ zuul.executor.log_root }}'
+        mode: pull
+        copy_links: true
+        verify_host: true
+        rsync_opts:
+          - --include=/logs/**
+          - --include=*/
+          - --exclude=*
+          - --prune-empty-dirs
diff --git a/playbooks/os-vif-ovs/run.yaml b/playbooks/os-vif-ovs/run.yaml
new file mode 100644
index 00000000..8170ccfc
--- /dev/null
+++ b/playbooks/os-vif-ovs/run.yaml
@@ -0,0 +1,40 @@
+- hosts: all
+  name: Autoconverted job legacy-tempest-dsvm-nova-os-vif from old job gate-tempest-dsvm-nova-os-vif-ubuntu-xenial-nv
+  tasks:
+
+    - name: Ensure legacy workspace directory
+      file:
+        path: '{{ ansible_user_dir }}/workspace'
+        state: directory
+
+    - shell:
+        cmd: |
+          set -e
+          set -x
+          cat > clonemap.yaml << EOF
+          clonemap:
+            - name: openstack-infra/devstack-gate
+              dest: devstack-gate
+          EOF
+          /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
+              git://git.openstack.org \
+              openstack-infra/devstack-gate
+        executable: /bin/bash
+        chdir: '{{ ansible_user_dir }}/workspace'
+      environment: '{{ zuul | zuul_legacy_vars }}'
+
+    - shell:
+        cmd: |
+          set -e
+          set -x
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TEMPEST=1
+          export DEVSTACK_GATE_TEMPEST_FULL=1
+          # enable to use os-vif for Nova
+          export DEVSTACK_PROJECT_FROM_GIT="os-vif"
+
+          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
+          ./safe-devstack-vm-gate-wrap.sh
+        executable: /bin/bash
+        chdir: '{{ ansible_user_dir }}/workspace'
+      environment: '{{ zuul | zuul_legacy_vars }}'