diff --git a/playbooks/legacy/sahara-image-elements-buildimages-ambari/run.yaml b/playbooks/legacy/sahara-image-elements-buildimages-ambari/run.yaml
deleted file mode 100644
index c4cb7cb1..00000000
--- a/playbooks/legacy/sahara-image-elements-buildimages-ambari/run.yaml
+++ /dev/null
@@ -1,55 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-sahara-image-elements-buildimages-ambari from old
-    job gate-sahara-image-elements-buildimages-ambari-ubuntu-xenial-nv
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          CLONEMAP=`mktemp`
-          function cleanup {
-              # In cases where zuul-cloner is aborted during a git
-              # clone operation, git will remove the git work tree in
-              # its cleanup. The work tree in these jobs is the
-              # workspace directory, which means that subsequent
-              # jenkins post-build actions can not run because the
-              # workspace has been removed.
-              # To reduce the likelihood of this having an impact,
-              # recreate the workspace directory if needed
-              mkdir -p $WORKSPACE
-              rm -f $CLONEMAP
-          }
-          trap cleanup EXIT
-          cat > $CLONEMAP << EOF
-          clonemap:
-            - name: $ZUUL_PROJECT
-              dest: .
-          EOF
-          /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
-              git://git.openstack.org $ZUUL_PROJECT
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          sudo mkdir -p /opt/sahara-image-build
-          sudo chown $(whoami) /opt/sahara-image-build
-          export DEST=/opt/sahara-image-build
-          ./tools/gate/build-images ambari
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/sahara-image-elements-buildimages-cloudera/run.yaml b/playbooks/legacy/sahara-image-elements-buildimages-cloudera/run.yaml
deleted file mode 100644
index 4f605cf0..00000000
--- a/playbooks/legacy/sahara-image-elements-buildimages-cloudera/run.yaml
+++ /dev/null
@@ -1,55 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-sahara-image-elements-buildimages-cloudera from old
-    job gate-sahara-image-elements-buildimages-cloudera-ubuntu-xenial-nv
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          CLONEMAP=`mktemp`
-          function cleanup {
-              # In cases where zuul-cloner is aborted during a git
-              # clone operation, git will remove the git work tree in
-              # its cleanup. The work tree in these jobs is the
-              # workspace directory, which means that subsequent
-              # jenkins post-build actions can not run because the
-              # workspace has been removed.
-              # To reduce the likelihood of this having an impact,
-              # recreate the workspace directory if needed
-              mkdir -p $WORKSPACE
-              rm -f $CLONEMAP
-          }
-          trap cleanup EXIT
-          cat > $CLONEMAP << EOF
-          clonemap:
-            - name: $ZUUL_PROJECT
-              dest: .
-          EOF
-          /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
-              git://git.openstack.org $ZUUL_PROJECT
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          sudo mkdir -p /opt/sahara-image-build
-          sudo chown $(whoami) /opt/sahara-image-build
-          export DEST=/opt/sahara-image-build
-          ./tools/gate/build-images cloudera
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/sahara-image-elements-buildimages-mapr/run.yaml b/playbooks/legacy/sahara-image-elements-buildimages-mapr/run.yaml
deleted file mode 100644
index c2719959..00000000
--- a/playbooks/legacy/sahara-image-elements-buildimages-mapr/run.yaml
+++ /dev/null
@@ -1,55 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-sahara-image-elements-buildimages-mapr from old job
-    gate-sahara-image-elements-buildimages-mapr-ubuntu-xenial-nv
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          CLONEMAP=`mktemp`
-          function cleanup {
-              # In cases where zuul-cloner is aborted during a git
-              # clone operation, git will remove the git work tree in
-              # its cleanup. The work tree in these jobs is the
-              # workspace directory, which means that subsequent
-              # jenkins post-build actions can not run because the
-              # workspace has been removed.
-              # To reduce the likelihood of this having an impact,
-              # recreate the workspace directory if needed
-              mkdir -p $WORKSPACE
-              rm -f $CLONEMAP
-          }
-          trap cleanup EXIT
-          cat > $CLONEMAP << EOF
-          clonemap:
-            - name: $ZUUL_PROJECT
-              dest: .
-          EOF
-          /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
-              git://git.openstack.org $ZUUL_PROJECT
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          sudo mkdir -p /opt/sahara-image-build
-          sudo chown $(whoami) /opt/sahara-image-build
-          export DEST=/opt/sahara-image-build
-          ./tools/gate/build-images mapr
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/sahara-image-elements-buildimages-plain/run.yaml b/playbooks/legacy/sahara-image-elements-buildimages-plain/run.yaml
deleted file mode 100644
index 3c312d60..00000000
--- a/playbooks/legacy/sahara-image-elements-buildimages-plain/run.yaml
+++ /dev/null
@@ -1,55 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-sahara-image-elements-buildimages-plain from old
-    job gate-sahara-image-elements-buildimages-plain-ubuntu-xenial-nv
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          CLONEMAP=`mktemp`
-          function cleanup {
-              # In cases where zuul-cloner is aborted during a git
-              # clone operation, git will remove the git work tree in
-              # its cleanup. The work tree in these jobs is the
-              # workspace directory, which means that subsequent
-              # jenkins post-build actions can not run because the
-              # workspace has been removed.
-              # To reduce the likelihood of this having an impact,
-              # recreate the workspace directory if needed
-              mkdir -p $WORKSPACE
-              rm -f $CLONEMAP
-          }
-          trap cleanup EXIT
-          cat > $CLONEMAP << EOF
-          clonemap:
-            - name: $ZUUL_PROJECT
-              dest: .
-          EOF
-          /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
-              git://git.openstack.org $ZUUL_PROJECT
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          sudo mkdir -p /opt/sahara-image-build
-          sudo chown $(whoami) /opt/sahara-image-build
-          export DEST=/opt/sahara-image-build
-          ./tools/gate/build-images plain
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/sahara-image-elements-buildimages-spark/run.yaml b/playbooks/legacy/sahara-image-elements-buildimages-spark/run.yaml
deleted file mode 100644
index a89c8677..00000000
--- a/playbooks/legacy/sahara-image-elements-buildimages-spark/run.yaml
+++ /dev/null
@@ -1,55 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-sahara-image-elements-buildimages-spark from old
-    job gate-sahara-image-elements-buildimages-spark-ubuntu-xenial-nv
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          CLONEMAP=`mktemp`
-          function cleanup {
-              # In cases where zuul-cloner is aborted during a git
-              # clone operation, git will remove the git work tree in
-              # its cleanup. The work tree in these jobs is the
-              # workspace directory, which means that subsequent
-              # jenkins post-build actions can not run because the
-              # workspace has been removed.
-              # To reduce the likelihood of this having an impact,
-              # recreate the workspace directory if needed
-              mkdir -p $WORKSPACE
-              rm -f $CLONEMAP
-          }
-          trap cleanup EXIT
-          cat > $CLONEMAP << EOF
-          clonemap:
-            - name: $ZUUL_PROJECT
-              dest: .
-          EOF
-          /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
-              git://git.openstack.org $ZUUL_PROJECT
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          sudo mkdir -p /opt/sahara-image-build
-          sudo chown $(whoami) /opt/sahara-image-build
-          export DEST=/opt/sahara-image-build
-          ./tools/gate/build-images spark
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/sahara-image-elements-buildimages-storm/run.yaml b/playbooks/legacy/sahara-image-elements-buildimages-storm/run.yaml
deleted file mode 100644
index 9161dca3..00000000
--- a/playbooks/legacy/sahara-image-elements-buildimages-storm/run.yaml
+++ /dev/null
@@ -1,55 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-sahara-image-elements-buildimages-storm from old
-    job gate-sahara-image-elements-buildimages-storm-ubuntu-xenial-nv
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          CLONEMAP=`mktemp`
-          function cleanup {
-              # In cases where zuul-cloner is aborted during a git
-              # clone operation, git will remove the git work tree in
-              # its cleanup. The work tree in these jobs is the
-              # workspace directory, which means that subsequent
-              # jenkins post-build actions can not run because the
-              # workspace has been removed.
-              # To reduce the likelihood of this having an impact,
-              # recreate the workspace directory if needed
-              mkdir -p $WORKSPACE
-              rm -f $CLONEMAP
-          }
-          trap cleanup EXIT
-          cat > $CLONEMAP << EOF
-          clonemap:
-            - name: $ZUUL_PROJECT
-              dest: .
-          EOF
-          /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
-              git://git.openstack.org $ZUUL_PROJECT
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          sudo mkdir -p /opt/sahara-image-build
-          sudo chown $(whoami) /opt/sahara-image-build
-          export DEST=/opt/sahara-image-build
-          ./tools/gate/build-images storm
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/sahara-image-elements-buildimages-vanilla/run.yaml b/playbooks/legacy/sahara-image-elements-buildimages-vanilla/run.yaml
deleted file mode 100644
index 45759328..00000000
--- a/playbooks/legacy/sahara-image-elements-buildimages-vanilla/run.yaml
+++ /dev/null
@@ -1,55 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-sahara-image-elements-buildimages-vanilla from old
-    job gate-sahara-image-elements-buildimages-vanilla-ubuntu-xenial-nv
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          CLONEMAP=`mktemp`
-          function cleanup {
-              # In cases where zuul-cloner is aborted during a git
-              # clone operation, git will remove the git work tree in
-              # its cleanup. The work tree in these jobs is the
-              # workspace directory, which means that subsequent
-              # jenkins post-build actions can not run because the
-              # workspace has been removed.
-              # To reduce the likelihood of this having an impact,
-              # recreate the workspace directory if needed
-              mkdir -p $WORKSPACE
-              rm -f $CLONEMAP
-          }
-          trap cleanup EXIT
-          cat > $CLONEMAP << EOF
-          clonemap:
-            - name: $ZUUL_PROJECT
-              dest: .
-          EOF
-          /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
-              git://git.openstack.org $ZUUL_PROJECT
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          sudo mkdir -p /opt/sahara-image-build
-          sudo chown $(whoami) /opt/sahara-image-build
-          export DEST=/opt/sahara-image-build
-          ./tools/gate/build-images vanilla
-        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 493a011a..1a744488 100644
--- a/zuul.d/zuul-legacy-jobs.yaml
+++ b/zuul.d/zuul-legacy-jobs.yaml
@@ -10046,48 +10046,6 @@
     run: playbooks/legacy/sahara-extra-artifacts/run
     timeout: 3900
 
-- job:
-    name: legacy-sahara-image-elements-buildimages-ambari
-    parent: legacy-base
-    run: playbooks/legacy/sahara-image-elements-buildimages-ambari/run
-    timeout: 7200
-
-- job:
-    name: legacy-sahara-image-elements-buildimages-cloudera
-    parent: legacy-base
-    run: playbooks/legacy/sahara-image-elements-buildimages-cloudera/run
-    timeout: 7200
-
-- job:
-    name: legacy-sahara-image-elements-buildimages-mapr
-    parent: legacy-base
-    run: playbooks/legacy/sahara-image-elements-buildimages-mapr/run
-    timeout: 7200
-
-- job:
-    name: legacy-sahara-image-elements-buildimages-plain
-    parent: legacy-base
-    run: playbooks/legacy/sahara-image-elements-buildimages-plain/run
-    timeout: 7200
-
-- job:
-    name: legacy-sahara-image-elements-buildimages-spark
-    parent: legacy-base
-    run: playbooks/legacy/sahara-image-elements-buildimages-spark/run
-    timeout: 7200
-
-- job:
-    name: legacy-sahara-image-elements-buildimages-storm
-    parent: legacy-base
-    run: playbooks/legacy/sahara-image-elements-buildimages-storm/run
-    timeout: 7200
-
-- job:
-    name: legacy-sahara-image-elements-buildimages-vanilla
-    parent: legacy-base
-    run: playbooks/legacy/sahara-image-elements-buildimages-vanilla/run
-    timeout: 7200
-
 - job:
     name: legacy-sandbox-tag
     parent: legacy-base