diff --git a/.zuul.yaml b/.zuul.yaml
index 1bcff7a..ca4eed2 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,30 +1,9 @@
-- job:
-    name: devstack-plugin-kafka-tempest-full
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/tempest-dsvm-full-kafka/run.yaml
-    post-run: playbooks/legacy/tempest-dsvm-full-kafka/post.yaml
-    timeout: 10800
-    required-projects:
-      - openstack/devstack-gate
-      - openstack/devstack-plugin-kafka
-      - openstack/tempest
-
 - project:
     check:
       jobs:
         - openstack-tox-bashate
-        - devstack-plugin-kafka-tempest-full:
-            irrelevant-files:
-              - ^(test-|)requirements.txt$
-              - ^setup.cfg$
-        - oslo.messaging-src-dsvm-full-kafka-default:
-            voting: false
-        - oslo.messaging-src-dsvm-full-kafka-default-centos-7:
+        - oslo.messaging-src-dsvm-full-kafka-hybrid:
             voting: false
     gate:
       jobs:
         - openstack-tox-bashate
-        - devstack-plugin-kafka-tempest-full:
-            irrelevant-files:
-              - ^(test-|)requirements.txt$
-              - ^setup.cfg$
diff --git a/playbooks/legacy/tempest-dsvm-full-kafka/post.yaml b/playbooks/legacy/tempest-dsvm-full-kafka/post.yaml
deleted file mode 100644
index e07f551..0000000
--- a/playbooks/legacy/tempest-dsvm-full-kafka/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-full-kafka/run.yaml b/playbooks/legacy/tempest-dsvm-full-kafka/run.yaml
deleted file mode 100644
index 5d332d8..0000000
--- a/playbooks/legacy/tempest-dsvm-full-kafka/run.yaml
+++ /dev/null
@@ -1,61 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-tempest-dsvm-full-kafka from old job gate-tempest-dsvm-full-kafka-ubuntu-xenial
-  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/devstack-gate
-              dest: devstack-gate
-          EOF
-          /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              https://opendev.org \
-              openstack/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 devstack-plugin-kafka https://opendev.org/openstack/devstack-plugin-kafka
-
-          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 PROJECTS="openstack/devstack-plugin-kafka $PROJECTS"
-
-          if [[ "kafka" = "sheepdog" ]]; then
-              export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1
-              # As we are setting DEVSTACK_GATE_TEMPEST_ALL_PLUGINS, we need
-              # to add the regex to limit the tests to the same as a tempest
-              # -efull would run.
-              export DEVSTACK_GATE_TEMPEST_REGEX='(?!.*\[.*\bslow\b.*\])(^tempest\.(api|scenario)|(^cinder\.tests.tempest))'
-          else
-              export DEVSTACK_GATE_TEMPEST_FULL=1
-          fi
-
-          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 }}'