diff --git a/playbooks/legacy/tempest-dsvm-zun-multinode-docker-sql/post.yaml b/playbooks/legacy/tempest-dsvm-zun-multinode-docker-sql/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/tempest-dsvm-zun-multinode-docker-sql/post.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-- 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/legacy/tempest-dsvm-zun-multinode-docker-sql/run.yaml b/playbooks/legacy/tempest-dsvm-zun-multinode-docker-sql/run.yaml
deleted file mode 100644
index 1f7b9bfb..00000000
--- a/playbooks/legacy/tempest-dsvm-zun-multinode-docker-sql/run.yaml
+++ /dev/null
@@ -1,84 +0,0 @@
-- hosts: primary
-  name: Autoconverted job legacy-tempest-dsvm-zun-multinode-docker-sql from old job
-    gate-tempest-dsvm-zun-multinode-docker-sql-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
-          cat << 'EOF' >>"/tmp/dg-local.conf"
-          [[local|localrc]]
-          enable_plugin zun git://git.openstack.org/openstack/zun
-
-          [[post-config|$KURYR_CONFIG]]
-          [DEFAULT]
-          capability_scope = global
-          debug = True
-
-          EOF
-        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_NEUTRON=1
-
-          # Enable tempest for tempest plugin
-          export ENABLED_SERVICES=tempest
-
-          export PROJECTS="openstack/zun $PROJECTS"
-          export PROJECTS="openstack/kuryr-libnetwork $PROJECTS"
-          export PROJECTS="openstack/python-zunclient $PROJECTS"
-          export PROJECTS="openstack/devstack-plugin-container $PROJECTS"
-
-          # Keep localrc to be able to set some vars in post_test_hook
-          export KEEP_LOCALRC=1
-          export DEVSTACK_GATE_TOPOLOGY="multinode"
-
-          function gate_hook {
-               cd /opt/stack/new/zun/
-              ./zun/tests/contrib/gate_hook.sh docker sql
-          }
-          export -f gate_hook
-
-          function post_test_hook {
-              source $BASE/new/devstack/accrc/admin/admin
-              cd /opt/stack/new/zun/
-              ./zun/tests/contrib/post_test_hook.sh docker
-          }
-
-          export -f post_test_hook
-
-          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 }}'
diff --git a/playbooks/legacy/zun-devstack-dsvm-docker-etcd/post.yaml b/playbooks/legacy/zun-devstack-dsvm-docker-etcd/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/zun-devstack-dsvm-docker-etcd/post.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-- 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/legacy/zun-devstack-dsvm-docker-etcd/run.yaml b/playbooks/legacy/zun-devstack-dsvm-docker-etcd/run.yaml
deleted file mode 100644
index a6a49329..00000000
--- a/playbooks/legacy/zun-devstack-dsvm-docker-etcd/run.yaml
+++ /dev/null
@@ -1,76 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-zun-devstack-dsvm-docker-etcd from old job gate-zun-devstack-dsvm-docker-etcd-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
-          cat << 'EOF' >>"/tmp/dg-local.conf"
-          [[local|localrc]]
-          enable_plugin zun git://git.openstack.org/openstack/zun
-
-          EOF
-        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=0
-          export DEVSTACK_GATE_NEUTRON=1
-
-          # Enable tempest for tempest plugin
-          export ENABLED_SERVICES=tempest
-
-          export PROJECTS="openstack/zun $PROJECTS"
-          export PROJECTS="openstack/kuryr-libnetwork $PROJECTS"
-          export PROJECTS="openstack/python-zunclient $PROJECTS"
-          export PROJECTS="openstack/devstack-plugin-container $PROJECTS"
-
-          # Keep localrc to be able to set some vars in post_test_hook
-          export KEEP_LOCALRC=1
-
-          function gate_hook {
-               cd /opt/stack/new/zun/
-              ./zun/tests/contrib/gate_hook.sh docker etcd
-          }
-          export -f gate_hook
-
-          function post_test_hook {
-              source $BASE/new/devstack/accrc/admin/admin
-              cd /opt/stack/new/zun/
-              ./zun/tests/contrib/post_test_hook.sh docker
-          }
-          export -f post_test_hook
-
-          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 }}'
diff --git a/playbooks/legacy/zun-devstack-dsvm-docker-split-plugin-sql/post.yaml b/playbooks/legacy/zun-devstack-dsvm-docker-split-plugin-sql/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/zun-devstack-dsvm-docker-split-plugin-sql/post.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-- 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/legacy/zun-devstack-dsvm-docker-split-plugin-sql/run.yaml b/playbooks/legacy/zun-devstack-dsvm-docker-split-plugin-sql/run.yaml
deleted file mode 100644
index 05883c1e..00000000
--- a/playbooks/legacy/zun-devstack-dsvm-docker-split-plugin-sql/run.yaml
+++ /dev/null
@@ -1,79 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-zun-devstack-dsvm-docker-split-plugin-sql from old
-    job gate-zun-devstack-dsvm-docker-split-plugin-sql-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
-          cat << 'EOF' >>"/tmp/dg-local.conf"
-          [[local|localrc]]
-          enable_plugin zun git://git.openstack.org/openstack/zun
-          TEMPEST_PLUGINS='/opt/stack/new/zun-tempest-plugin'
-
-          EOF
-        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=0
-          export DEVSTACK_GATE_NEUTRON=1
-
-          # Enable tempest for tempest plugin
-          export ENABLED_SERVICES=tempest
-
-          export PROJECTS="openstack/zun $PROJECTS"
-          export PROJECTS="openstack/kuryr-libnetwork $PROJECTS"
-          export PROJECTS="openstack/python-zunclient $PROJECTS"
-          export PROJECTS="openstack/devstack-plugin-container $PROJECTS"
-          export PROJECTS="openstack/zun-tempest-plugin $PROJECTS"
-
-          # Keep localrc to be able to set some vars in post_test_hook
-          export KEEP_LOCALRC=1
-
-          function gate_hook {
-               cd /opt/stack/new/zun/
-              ./zun/tests/contrib/gate_hook.sh docker sql
-          }
-          export -f gate_hook
-
-          function post_test_hook {
-              source $BASE/new/devstack/accrc/admin/admin
-              cd /opt/stack/new/zun/
-              ./zun/tests/contrib/post_test_hook.sh docker
-          }
-          export -f post_test_hook
-
-          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 }}'
diff --git a/playbooks/legacy/zun-devstack-dsvm-docker-sql/post.yaml b/playbooks/legacy/zun-devstack-dsvm-docker-sql/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/zun-devstack-dsvm-docker-sql/post.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-- 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/legacy/zun-devstack-dsvm-docker-sql/run.yaml b/playbooks/legacy/zun-devstack-dsvm-docker-sql/run.yaml
deleted file mode 100644
index f4e1898c..00000000
--- a/playbooks/legacy/zun-devstack-dsvm-docker-sql/run.yaml
+++ /dev/null
@@ -1,76 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-zun-devstack-dsvm-docker-sql from old job gate-zun-devstack-dsvm-docker-sql
-  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
-          cat << 'EOF' >>"/tmp/dg-local.conf"
-          [[local|localrc]]
-          enable_plugin zun git://git.openstack.org/openstack/zun
-
-          EOF
-        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=0
-          export DEVSTACK_GATE_NEUTRON=1
-
-          # Enable tempest for tempest plugin
-          export ENABLED_SERVICES=tempest
-
-          export PROJECTS="openstack/zun $PROJECTS"
-          export PROJECTS="openstack/kuryr-libnetwork $PROJECTS"
-          export PROJECTS="openstack/python-zunclient $PROJECTS"
-          export PROJECTS="openstack/devstack-plugin-container $PROJECTS"
-
-          # Keep localrc to be able to set some vars in post_test_hook
-          export KEEP_LOCALRC=1
-
-          function gate_hook {
-               cd /opt/stack/new/zun/
-              ./zun/tests/contrib/gate_hook.sh docker sql
-          }
-          export -f gate_hook
-
-          function post_test_hook {
-              source $BASE/new/devstack/accrc/admin/admin
-              cd /opt/stack/new/zun/
-              ./zun/tests/contrib/post_test_hook.sh docker
-          }
-          export -f post_test_hook
-
-          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 }}'
diff --git a/playbooks/legacy/zun-devstack-dsvm-py35-docker-sql/post.yaml b/playbooks/legacy/zun-devstack-dsvm-py35-docker-sql/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/zun-devstack-dsvm-py35-docker-sql/post.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-- 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/legacy/zun-devstack-dsvm-py35-docker-sql/run.yaml b/playbooks/legacy/zun-devstack-dsvm-py35-docker-sql/run.yaml
deleted file mode 100644
index 121600bc..00000000
--- a/playbooks/legacy/zun-devstack-dsvm-py35-docker-sql/run.yaml
+++ /dev/null
@@ -1,81 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-zun-devstack-dsvm-py35-docker-sql from old job gate-zun-devstack-dsvm-py35-docker-sql
-  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
-          cat << 'EOF' >>"/tmp/dg-local.conf"
-          [[local|localrc]]
-          enable_plugin zun git://git.openstack.org/openstack/zun
-          # swift is not ready for python3 yet
-          disable_service s-account
-          disable_service s-container
-          disable_service s-object
-          disable_service s-proxy
-
-          EOF
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          export DEVSTACK_GATE_USE_PYTHON3=True
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TEMPEST=0
-          export DEVSTACK_GATE_NEUTRON=1
-
-          # Enable tempest for tempest plugin
-          export ENABLED_SERVICES=tempest
-
-          export PROJECTS="openstack/zun $PROJECTS"
-          export PROJECTS="openstack/kuryr-libnetwork $PROJECTS"
-          export PROJECTS="openstack/python-zunclient $PROJECTS"
-          export PROJECTS="openstack/devstack-plugin-container $PROJECTS"
-
-          # Keep localrc to be able to set some vars in post_test_hook
-          export KEEP_LOCALRC=1
-
-          function gate_hook {
-               cd /opt/stack/new/zun/
-              ./zun/tests/contrib/gate_hook.sh docker sql
-          }
-          export -f gate_hook
-
-          function post_test_hook {
-              source $BASE/new/devstack/accrc/admin/admin
-              cd /opt/stack/new/zun/
-              ./zun/tests/contrib/post_test_hook.sh docker
-          }
-          export -f post_test_hook
-
-          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 }}'
diff --git a/zuul.d/zuul-legacy-jobs.yaml b/zuul.d/zuul-legacy-jobs.yaml
index 3c80bb04..3211cab1 100644
--- a/zuul.d/zuul-legacy-jobs.yaml
+++ b/zuul.d/zuul-legacy-jobs.yaml
@@ -14029,21 +14029,6 @@
       - openstack/devstack-plugin-zmq
       - openstack/tempest
 
-- job:
-    name: legacy-tempest-dsvm-zun-multinode-docker-sql
-    parent: legacy-dsvm-base-multinode
-    run: playbooks/legacy/tempest-dsvm-zun-multinode-docker-sql/run
-    post-run: playbooks/legacy/tempest-dsvm-zun-multinode-docker-sql/post
-    timeout: 7800
-    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/devstack-plugin-container
-      - openstack/kuryr-libnetwork
-      - openstack/python-zunclient
-      - openstack/tempest
-      - openstack/zun
-    nodeset: legacy-ubuntu-xenial-2-node
-
 - job:
     name: legacy-tempest-neutron-dsvm-src-oslo.messaging-amqp1-hybrid
     parent: legacy-dsvm-base
@@ -15743,63 +15728,6 @@
     timeout: 1800
     nodeset: legacy-ubuntu-trusty
 
-- job:
-    name: legacy-zun-devstack-dsvm-docker-etcd
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/zun-devstack-dsvm-docker-etcd/run
-    post-run: playbooks/legacy/zun-devstack-dsvm-docker-etcd/post
-    timeout: 4200
-    required-projects:
-      - openstack-dev/devstack
-      - openstack-infra/devstack-gate
-      - openstack/devstack-plugin-container
-      - openstack/kuryr-libnetwork
-      - openstack/python-zunclient
-      - openstack/zun
-
-- job:
-    name: legacy-zun-devstack-dsvm-docker-split-plugin-sql
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/zun-devstack-dsvm-docker-split-plugin-sql/run
-    post-run: playbooks/legacy/zun-devstack-dsvm-docker-split-plugin-sql/post
-    timeout: 4200
-    required-projects:
-      - openstack-dev/devstack
-      - openstack-infra/devstack-gate
-      - openstack/devstack-plugin-container
-      - openstack/kuryr-libnetwork
-      - openstack/python-zunclient
-      - openstack/zun
-      - openstack/zun-tempest-plugin
-
-- job:
-    name: legacy-zun-devstack-dsvm-docker-sql
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/zun-devstack-dsvm-docker-sql/run
-    post-run: playbooks/legacy/zun-devstack-dsvm-docker-sql/post
-    timeout: 4200
-    required-projects:
-      - openstack-dev/devstack
-      - openstack-infra/devstack-gate
-      - openstack/devstack-plugin-container
-      - openstack/kuryr-libnetwork
-      - openstack/python-zunclient
-      - openstack/zun
-
-- job:
-    name: legacy-zun-devstack-dsvm-py35-docker-sql
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/zun-devstack-dsvm-py35-docker-sql/run
-    post-run: playbooks/legacy/zun-devstack-dsvm-py35-docker-sql/post
-    timeout: 4200
-    required-projects:
-      - openstack-dev/devstack
-      - openstack-infra/devstack-gate
-      - openstack/devstack-plugin-container
-      - openstack/kuryr-libnetwork
-      - openstack/python-zunclient
-      - openstack/zun
-
 - job:
     name: legacy-zun-ui-nodejs4-npm-run-lint
     parent: legacy-base