diff --git a/playbooks/legacy/manila-publishimage-generic/post.yaml b/playbooks/legacy/manila-publishimage-generic/post.yaml
deleted file mode 100644
index 16fa8727..00000000
--- a/playbooks/legacy/manila-publishimage-generic/post.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-- hosts: primary
-  tasks:
-
-    - name: Ensure artifacts directory exists
-      file:
-        path: '{{ zuul.executor.work_root }}/artifacts'
-        state: directory
-      delegate_to: localhost
-
-    - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
-      synchronize:
-        src: '{{ ansible_user_dir }}/workspace/'
-        dest: '{{ zuul.executor.work_root }}/artifacts/images/'
-        mode: pull
-        copy_links: true
-        verify_host: true
-        rsync_opts:
-          - --include=/images/*
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
diff --git a/playbooks/legacy/manila-publishimage-generic/run.yaml b/playbooks/legacy/manila-publishimage-generic/run.yaml
deleted file mode 100644
index 93899475..00000000
--- a/playbooks/legacy/manila-publishimage-generic/run.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-manila-publishimage-generic from old job gate-manila-publishimage-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
-          BRANCH=$ZUUL_REFNAME
-          BRANCH_PATH=`echo $BRANCH | sed 's/^refs.tags.//' | tr / -`
-          mkdir -p images
-          mv manila-service-image.qcow2 images/manila-service-image-$BRANCH_PATH.qcow2
-        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 683d1252..d830b832 100644
--- a/zuul.d/zuul-legacy-jobs.yaml
+++ b/zuul.d/zuul-legacy-jobs.yaml
@@ -603,13 +603,6 @@
     nodeset: legacy-ubuntu-trusty
     branches: master
 
-- job:
-    name: legacy-manila-publishimage-generic
-    parent: legacy-publish-openstack-artifacts
-    run: playbooks/legacy/manila-publishimage-generic/run.yaml
-    post-run: playbooks/legacy/manila-publishimage-generic/post.yaml
-    timeout: 1800
-
 - job:
     name: legacy-monasca-api-localrepo-upload
     parent: legacy-publish-openstack-artifacts