diff --git a/playbooks/legacy/manila-buildimage-docker/run.yaml b/playbooks/legacy/manila-buildimage-docker/run.yaml
deleted file mode 100644
index b57b3833..00000000
--- a/playbooks/legacy/manila-buildimage-docker/run.yaml
+++ /dev/null
@@ -1,49 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-manila-buildimage-docker from old job gate-manila-buildimage-docker-ubuntu-xenial
-  roles:
-    - bindep
-
-  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: |
-          set -e
-          set -x
-          ./tools/gate/build-images docker
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/manila-buildimage-generic/run.yaml b/playbooks/legacy/manila-buildimage-generic/run.yaml
deleted file mode 100644
index 054b217a..00000000
--- a/playbooks/legacy/manila-buildimage-generic/run.yaml
+++ /dev/null
@@ -1,49 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-manila-buildimage-generic from old job gate-manila-buildimage-generic-ubuntu-xenial
-  roles:
-    - bindep
-
-  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: |
-          set -e
-          set -x
-          ./tools/gate/build-images generic
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/manila-test-image-build/run.yaml b/playbooks/legacy/manila-test-image-build/run.yaml
deleted file mode 100644
index 80cdeb00..00000000
--- a/playbooks/legacy/manila-test-image-build/run.yaml
+++ /dev/null
@@ -1,49 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-manila-test-image-build from old job gate-manila-test-image-build
-  roles:
-    - bindep
-
-  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: |
-          set -e
-          set -x
-          ./run-buildroot.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 aedff693..3e3252e3 100644
--- a/zuul.d/zuul-legacy-jobs.yaml
+++ b/zuul.d/zuul-legacy-jobs.yaml
@@ -603,18 +603,6 @@
     nodeset: legacy-ubuntu-trusty
     branches: master
 
-- job:
-    name: legacy-manila-buildimage-docker
-    parent: legacy-base
-    run: playbooks/legacy/manila-buildimage-docker/run.yaml
-    timeout: 1800
-
-- job:
-    name: legacy-manila-buildimage-generic
-    parent: legacy-base
-    run: playbooks/legacy/manila-buildimage-generic/run.yaml
-    timeout: 1800
-
 - job:
     name: legacy-manila-publishimage-generic
     parent: legacy-publish-openstack-artifacts
@@ -622,12 +610,6 @@
     post-run: playbooks/legacy/manila-publishimage-generic/post.yaml
     timeout: 1800
 
-- job:
-    name: legacy-manila-test-image-build
-    parent: legacy-base
-    run: playbooks/legacy/manila-test-image-build/run.yaml
-    timeout: 3600
-
 - job:
     name: legacy-monasca-api-localrepo-upload
     parent: legacy-publish-openstack-artifacts