diff --git a/playbooks/legacy/dsvm-collectd-ceilometer-plugin-bin-centos-7/post.yaml b/playbooks/legacy/dsvm-collectd-ceilometer-plugin-bin-centos-7/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/dsvm-collectd-ceilometer-plugin-bin-centos-7/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/dsvm-collectd-ceilometer-plugin-bin-centos-7/run.yaml b/playbooks/legacy/dsvm-collectd-ceilometer-plugin-bin-centos-7/run.yaml
deleted file mode 100644
index ae6096fd..00000000
--- a/playbooks/legacy/dsvm-collectd-ceilometer-plugin-bin-centos-7/run.yaml
+++ /dev/null
@@ -1,78 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-dsvm-collectd-ceilometer-plugin-bin-centos-7 from
-    old job gate-dsvm-collectd-ceilometer-plugin-bin-centos-7-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 aodh git://git.openstack.org/openstack/aodh
-          enable_plugin gnocchi http://github.com/gnocchixyz/gnocchi.git
-          enable_plugin collectd-ceilometer-plugin git://git.openstack.org/openstack/collectd-ceilometer-plugin
-
-          EOF
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          export BRANCH_OVERRIDE=default
-          export PYTHONUNBUFFERED=true
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          fi
-          # We need to add those projects into repository, they are not available by default
-          # and we are using all of them in our plugin
-          export PROJECTS="openstack/aodh $PROJECTS"
-          export PROJECTS="openstack/collectd-ceilometer-plugin $PROJECTS"
-          # Keep localrc to be able to set some vars in pre_test_hook
-          export KEEP_LOCALRC=1
-
-          function pre_test_hook {
-               if [ -f $BASE/new/collectd-ceilometer-plugin/devstack/gate/pre_test_hook_bin.sh ] ; then
-                   . $BASE/new/collectd-ceilometer-plugin/devstack/gate/pre_test_hook_bin.sh
-               fi
-          }
-          export -f pre_test_hook
-
-          function post_test_hook {
-               if [ -f $BASE/new/collectd-ceilometer-plugin/devstack/gate/post_test_hook_bin.sh ] ; then
-                   . $BASE/new/collectd-ceilometer-plugin/devstack/gate/post_test_hook_bin.sh
-               fi
-           }
-           export -f post_test_hook
-
-           export DEVSTACK_GATE_SETTINGS=/opt/stack/new/collectd-ceilometer-plugin/devstack/gate/devstackgaterc
-
-           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/dsvm-collectd-ceilometer-plugin-bin/post.yaml b/playbooks/legacy/dsvm-collectd-ceilometer-plugin-bin/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/dsvm-collectd-ceilometer-plugin-bin/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/dsvm-collectd-ceilometer-plugin-bin/run.yaml b/playbooks/legacy/dsvm-collectd-ceilometer-plugin-bin/run.yaml
deleted file mode 100644
index cb04b1cf..00000000
--- a/playbooks/legacy/dsvm-collectd-ceilometer-plugin-bin/run.yaml
+++ /dev/null
@@ -1,78 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-dsvm-collectd-ceilometer-plugin-bin from old job
-    gate-dsvm-collectd-ceilometer-plugin-bin-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 aodh git://git.openstack.org/openstack/aodh
-          enable_plugin gnocchi http://github.com/gnocchixyz/gnocchi.git
-          enable_plugin collectd-ceilometer-plugin git://git.openstack.org/openstack/collectd-ceilometer-plugin
-
-          EOF
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          export BRANCH_OVERRIDE=default
-          export PYTHONUNBUFFERED=true
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          fi
-          # We need to add those projects into repository, they are not available by default
-          # and we are using all of them in our plugin
-          export PROJECTS="openstack/aodh $PROJECTS"
-          export PROJECTS="openstack/collectd-ceilometer-plugin $PROJECTS"
-          # Keep localrc to be able to set some vars in pre_test_hook
-          export KEEP_LOCALRC=1
-
-          function pre_test_hook {
-               if [ -f $BASE/new/collectd-ceilometer-plugin/devstack/gate/pre_test_hook_bin.sh ] ; then
-                   . $BASE/new/collectd-ceilometer-plugin/devstack/gate/pre_test_hook_bin.sh
-               fi
-          }
-          export -f pre_test_hook
-
-          function post_test_hook {
-               if [ -f $BASE/new/collectd-ceilometer-plugin/devstack/gate/post_test_hook_bin.sh ] ; then
-                   . $BASE/new/collectd-ceilometer-plugin/devstack/gate/post_test_hook_bin.sh
-               fi
-           }
-           export -f post_test_hook
-
-           export DEVSTACK_GATE_SETTINGS=/opt/stack/new/collectd-ceilometer-plugin/devstack/gate/devstackgaterc
-
-           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/dsvm-collectd-ceilometer-plugin-src-centos-7/post.yaml b/playbooks/legacy/dsvm-collectd-ceilometer-plugin-src-centos-7/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/dsvm-collectd-ceilometer-plugin-src-centos-7/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/dsvm-collectd-ceilometer-plugin-src-centos-7/run.yaml b/playbooks/legacy/dsvm-collectd-ceilometer-plugin-src-centos-7/run.yaml
deleted file mode 100644
index b0f11459..00000000
--- a/playbooks/legacy/dsvm-collectd-ceilometer-plugin-src-centos-7/run.yaml
+++ /dev/null
@@ -1,78 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-dsvm-collectd-ceilometer-plugin-src-centos-7 from
-    old job gate-dsvm-collectd-ceilometer-plugin-src-centos-7-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 aodh git://git.openstack.org/openstack/aodh
-          enable_plugin gnocchi http://github.com/gnocchixyz/gnocchi.git
-          enable_plugin collectd-ceilometer-plugin git://git.openstack.org/openstack/collectd-ceilometer-plugin
-
-          EOF
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          export BRANCH_OVERRIDE=default
-          export PYTHONUNBUFFERED=true
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          fi
-          # We need to add those projects into repository, they are not available by default
-          # and we are using all of them in our plugin
-          export PROJECTS="openstack/aodh $PROJECTS"
-          export PROJECTS="openstack/collectd-ceilometer-plugin $PROJECTS"
-          # Keep localrc to be able to set some vars in pre_test_hook
-          export KEEP_LOCALRC=1
-
-          function pre_test_hook {
-               if [ -f $BASE/new/collectd-ceilometer-plugin/devstack/gate/pre_test_hook_src.sh ] ; then
-                   . $BASE/new/collectd-ceilometer-plugin/devstack/gate/pre_test_hook_src.sh
-               fi
-          }
-          export -f pre_test_hook
-
-          function post_test_hook {
-               if [ -f $BASE/new/collectd-ceilometer-plugin/devstack/gate/post_test_hook_src.sh ] ; then
-                   . $BASE/new/collectd-ceilometer-plugin/devstack/gate/post_test_hook_src.sh
-               fi
-           }
-           export -f post_test_hook
-
-           export DEVSTACK_GATE_SETTINGS=/opt/stack/new/collectd-ceilometer-plugin/devstack/gate/devstackgaterc
-
-           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/dsvm-collectd-ceilometer-plugin-src/post.yaml b/playbooks/legacy/dsvm-collectd-ceilometer-plugin-src/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/dsvm-collectd-ceilometer-plugin-src/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/dsvm-collectd-ceilometer-plugin-src/run.yaml b/playbooks/legacy/dsvm-collectd-ceilometer-plugin-src/run.yaml
deleted file mode 100644
index 934b7f79..00000000
--- a/playbooks/legacy/dsvm-collectd-ceilometer-plugin-src/run.yaml
+++ /dev/null
@@ -1,78 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-dsvm-collectd-ceilometer-plugin-src from old job
-    gate-dsvm-collectd-ceilometer-plugin-src-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 aodh git://git.openstack.org/openstack/aodh
-          enable_plugin gnocchi http://github.com/gnocchixyz/gnocchi.git
-          enable_plugin collectd-ceilometer-plugin git://git.openstack.org/openstack/collectd-ceilometer-plugin
-
-          EOF
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          export BRANCH_OVERRIDE=default
-          export PYTHONUNBUFFERED=true
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          fi
-          # We need to add those projects into repository, they are not available by default
-          # and we are using all of them in our plugin
-          export PROJECTS="openstack/aodh $PROJECTS"
-          export PROJECTS="openstack/collectd-ceilometer-plugin $PROJECTS"
-          # Keep localrc to be able to set some vars in pre_test_hook
-          export KEEP_LOCALRC=1
-
-          function pre_test_hook {
-               if [ -f $BASE/new/collectd-ceilometer-plugin/devstack/gate/pre_test_hook_src.sh ] ; then
-                   . $BASE/new/collectd-ceilometer-plugin/devstack/gate/pre_test_hook_src.sh
-               fi
-          }
-          export -f pre_test_hook
-
-          function post_test_hook {
-               if [ -f $BASE/new/collectd-ceilometer-plugin/devstack/gate/post_test_hook_src.sh ] ; then
-                   . $BASE/new/collectd-ceilometer-plugin/devstack/gate/post_test_hook_src.sh
-               fi
-           }
-           export -f post_test_hook
-
-           export DEVSTACK_GATE_SETTINGS=/opt/stack/new/collectd-ceilometer-plugin/devstack/gate/devstackgaterc
-
-           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 72fefa80..9794f168 100644
--- a/zuul.d/zuul-legacy-jobs.yaml
+++ b/zuul.d/zuul-legacy-jobs.yaml
@@ -1830,56 +1830,6 @@
       - openstack-infra/devstack-gate
     branches: master
 
-- job:
-    name: legacy-dsvm-collectd-ceilometer-plugin-bin
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/dsvm-collectd-ceilometer-plugin-bin/run
-    post-run: playbooks/legacy/dsvm-collectd-ceilometer-plugin-bin/post
-    timeout: 7800
-    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/aodh
-      - openstack/ceilometer
-      - openstack/collectd-ceilometer-plugin
-
-- job:
-    name: legacy-dsvm-collectd-ceilometer-plugin-bin-centos-7
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/dsvm-collectd-ceilometer-plugin-bin-centos-7/run
-    post-run: playbooks/legacy/dsvm-collectd-ceilometer-plugin-bin-centos-7/post
-    timeout: 7800
-    nodeset: legacy-centos-7
-    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/aodh
-      - openstack/ceilometer
-      - openstack/collectd-ceilometer-plugin
-
-- job:
-    name: legacy-dsvm-collectd-ceilometer-plugin-src
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/dsvm-collectd-ceilometer-plugin-src/run
-    post-run: playbooks/legacy/dsvm-collectd-ceilometer-plugin-src/post
-    timeout: 7800
-    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/aodh
-      - openstack/ceilometer
-      - openstack/collectd-ceilometer-plugin
-
-- job:
-    name: legacy-dsvm-collectd-ceilometer-plugin-src-centos-7
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/dsvm-collectd-ceilometer-plugin-src-centos-7/run
-    post-run: playbooks/legacy/dsvm-collectd-ceilometer-plugin-src-centos-7/post
-    timeout: 7800
-    nodeset: legacy-centos-7
-    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/aodh
-      - openstack/ceilometer
-      - openstack/collectd-ceilometer-plugin
-
 - job:
     name: legacy-dsvm-murano-apps-refstackclient-unittest
     parent: legacy-dsvm-base