diff --git a/playbooks/legacy/bindep-fallback-centos-7/post.yaml b/playbooks/legacy/bindep-fallback-centos-7/post.yaml
deleted file mode 100644
index 68fbdf81..00000000
--- a/playbooks/legacy/bindep-fallback-centos-7/post.yaml
+++ /dev/null
@@ -1,67 +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=**/*nose_results.html
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
-
-    - 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=**/*testr_results.html.gz
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
-
-    - 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=/.testrepository/tmp*
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
-
-    - 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=**/*testrepository.subunit.gz
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
-
-    - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
-      synchronize:
-        src: '{{ ansible_user_dir }}/workspace/'
-        dest: '{{ zuul.executor.log_root }}/tox'
-        mode: pull
-        copy_links: true
-        verify_host: true
-        rsync_opts:
-          - --include=/.tox/*/log/*
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
diff --git a/playbooks/legacy/bindep-fallback-centos-7/run.yaml b/playbooks/legacy/bindep-fallback-centos-7/run.yaml
deleted file mode 100644
index 5c011f2c..00000000
--- a/playbooks/legacy/bindep-fallback-centos-7/run.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-bindep-fallback-centos-7 from old job gate-{name}-bindep-fallback-centos-7
-  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
-          # use the fallback list instead of existing bindep.txt
-          export PACKAGES=/usr/local/jenkins/common_data/bindep-fallback.txt
-          if [ "$ZUUL_PROJECT" == "openstack-infra/bindep" ] ; then
-              # if testing a change to bindep, use its entrypoint
-              virtualenv bindep-env
-              bindep-env/bin/pip install -U .
-              export BINDEP=bindep-env/bin/bindep
-          elif [ "$ZUUL_PROJECT" == "openstack-infra/project-config" ] ; then
-              # if testing a change to project-config, use its fallback list
-              export PACKAGES=jenkins/data/bindep-fallback.txt
-          fi
-          /usr/local/jenkins/slave_scripts/install-distro-packages.sh
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/bindep-fallback-debian-jessie/post.yaml b/playbooks/legacy/bindep-fallback-debian-jessie/post.yaml
deleted file mode 100644
index 68fbdf81..00000000
--- a/playbooks/legacy/bindep-fallback-debian-jessie/post.yaml
+++ /dev/null
@@ -1,67 +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=**/*nose_results.html
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
-
-    - 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=**/*testr_results.html.gz
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
-
-    - 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=/.testrepository/tmp*
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
-
-    - 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=**/*testrepository.subunit.gz
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
-
-    - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
-      synchronize:
-        src: '{{ ansible_user_dir }}/workspace/'
-        dest: '{{ zuul.executor.log_root }}/tox'
-        mode: pull
-        copy_links: true
-        verify_host: true
-        rsync_opts:
-          - --include=/.tox/*/log/*
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
diff --git a/playbooks/legacy/bindep-fallback-debian-jessie/run.yaml b/playbooks/legacy/bindep-fallback-debian-jessie/run.yaml
deleted file mode 100644
index dd70b4af..00000000
--- a/playbooks/legacy/bindep-fallback-debian-jessie/run.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-bindep-fallback-debian-jessie from old job gate-{name}-bindep-fallback-debian-jessie
-  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
-          # use the fallback list instead of existing bindep.txt
-          export PACKAGES=/usr/local/jenkins/common_data/bindep-fallback.txt
-          if [ "$ZUUL_PROJECT" == "openstack-infra/bindep" ] ; then
-              # if testing a change to bindep, use its entrypoint
-              virtualenv bindep-env
-              bindep-env/bin/pip install -U .
-              export BINDEP=bindep-env/bin/bindep
-          elif [ "$ZUUL_PROJECT" == "openstack-infra/project-config" ] ; then
-              # if testing a change to project-config, use its fallback list
-              export PACKAGES=jenkins/data/bindep-fallback.txt
-          fi
-          /usr/local/jenkins/slave_scripts/install-distro-packages.sh
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/bindep-fallback-fedora-26/post.yaml b/playbooks/legacy/bindep-fallback-fedora-26/post.yaml
deleted file mode 100644
index 68fbdf81..00000000
--- a/playbooks/legacy/bindep-fallback-fedora-26/post.yaml
+++ /dev/null
@@ -1,67 +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=**/*nose_results.html
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
-
-    - 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=**/*testr_results.html.gz
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
-
-    - 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=/.testrepository/tmp*
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
-
-    - 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=**/*testrepository.subunit.gz
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
-
-    - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
-      synchronize:
-        src: '{{ ansible_user_dir }}/workspace/'
-        dest: '{{ zuul.executor.log_root }}/tox'
-        mode: pull
-        copy_links: true
-        verify_host: true
-        rsync_opts:
-          - --include=/.tox/*/log/*
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
diff --git a/playbooks/legacy/bindep-fallback-fedora-26/run.yaml b/playbooks/legacy/bindep-fallback-fedora-26/run.yaml
deleted file mode 100644
index e0bee522..00000000
--- a/playbooks/legacy/bindep-fallback-fedora-26/run.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-bindep-fallback-fedora-26 from old job gate-{name}-bindep-fallback-fedora-26
-  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
-          # use the fallback list instead of existing bindep.txt
-          export PACKAGES=/usr/local/jenkins/common_data/bindep-fallback.txt
-          if [ "$ZUUL_PROJECT" == "openstack-infra/bindep" ] ; then
-              # if testing a change to bindep, use its entrypoint
-              virtualenv bindep-env
-              bindep-env/bin/pip install -U .
-              export BINDEP=bindep-env/bin/bindep
-          elif [ "$ZUUL_PROJECT" == "openstack-infra/project-config" ] ; then
-              # if testing a change to project-config, use its fallback list
-              export PACKAGES=jenkins/data/bindep-fallback.txt
-          fi
-          /usr/local/jenkins/slave_scripts/install-distro-packages.sh
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/bindep-fallback-opensuse-423/post.yaml b/playbooks/legacy/bindep-fallback-opensuse-423/post.yaml
deleted file mode 100644
index 68fbdf81..00000000
--- a/playbooks/legacy/bindep-fallback-opensuse-423/post.yaml
+++ /dev/null
@@ -1,67 +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=**/*nose_results.html
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
-
-    - 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=**/*testr_results.html.gz
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
-
-    - 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=/.testrepository/tmp*
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
-
-    - 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=**/*testrepository.subunit.gz
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
-
-    - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
-      synchronize:
-        src: '{{ ansible_user_dir }}/workspace/'
-        dest: '{{ zuul.executor.log_root }}/tox'
-        mode: pull
-        copy_links: true
-        verify_host: true
-        rsync_opts:
-          - --include=/.tox/*/log/*
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
diff --git a/playbooks/legacy/bindep-fallback-opensuse-423/run.yaml b/playbooks/legacy/bindep-fallback-opensuse-423/run.yaml
deleted file mode 100644
index 5a6573b7..00000000
--- a/playbooks/legacy/bindep-fallback-opensuse-423/run.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-bindep-fallback-opensuse-423 from old job gate-{name}-bindep-fallback-opensuse-423
-  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
-          # use the fallback list instead of existing bindep.txt
-          export PACKAGES=/usr/local/jenkins/common_data/bindep-fallback.txt
-          if [ "$ZUUL_PROJECT" == "openstack-infra/bindep" ] ; then
-              # if testing a change to bindep, use its entrypoint
-              virtualenv bindep-env
-              bindep-env/bin/pip install -U .
-              export BINDEP=bindep-env/bin/bindep
-          elif [ "$ZUUL_PROJECT" == "openstack-infra/project-config" ] ; then
-              # if testing a change to project-config, use its fallback list
-              export PACKAGES=jenkins/data/bindep-fallback.txt
-          fi
-          /usr/local/jenkins/slave_scripts/install-distro-packages.sh
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/bindep-fallback-ubuntu-trusty/post.yaml b/playbooks/legacy/bindep-fallback-ubuntu-trusty/post.yaml
deleted file mode 100644
index 68fbdf81..00000000
--- a/playbooks/legacy/bindep-fallback-ubuntu-trusty/post.yaml
+++ /dev/null
@@ -1,67 +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=**/*nose_results.html
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
-
-    - 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=**/*testr_results.html.gz
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
-
-    - 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=/.testrepository/tmp*
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
-
-    - 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=**/*testrepository.subunit.gz
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
-
-    - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
-      synchronize:
-        src: '{{ ansible_user_dir }}/workspace/'
-        dest: '{{ zuul.executor.log_root }}/tox'
-        mode: pull
-        copy_links: true
-        verify_host: true
-        rsync_opts:
-          - --include=/.tox/*/log/*
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
diff --git a/playbooks/legacy/bindep-fallback-ubuntu-trusty/run.yaml b/playbooks/legacy/bindep-fallback-ubuntu-trusty/run.yaml
deleted file mode 100644
index 6a40409a..00000000
--- a/playbooks/legacy/bindep-fallback-ubuntu-trusty/run.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-bindep-fallback-ubuntu-trusty from old job gate-{name}-bindep-fallback-ubuntu-trusty
-  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
-          # use the fallback list instead of existing bindep.txt
-          export PACKAGES=/usr/local/jenkins/common_data/bindep-fallback.txt
-          if [ "$ZUUL_PROJECT" == "openstack-infra/bindep" ] ; then
-              # if testing a change to bindep, use its entrypoint
-              virtualenv bindep-env
-              bindep-env/bin/pip install -U .
-              export BINDEP=bindep-env/bin/bindep
-          elif [ "$ZUUL_PROJECT" == "openstack-infra/project-config" ] ; then
-              # if testing a change to project-config, use its fallback list
-              export PACKAGES=jenkins/data/bindep-fallback.txt
-          fi
-          /usr/local/jenkins/slave_scripts/install-distro-packages.sh
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/bindep-fallback/post.yaml b/playbooks/legacy/bindep-fallback/post.yaml
deleted file mode 100644
index 68fbdf81..00000000
--- a/playbooks/legacy/bindep-fallback/post.yaml
+++ /dev/null
@@ -1,67 +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=**/*nose_results.html
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
-
-    - 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=**/*testr_results.html.gz
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
-
-    - 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=/.testrepository/tmp*
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
-
-    - 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=**/*testrepository.subunit.gz
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
-
-    - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
-      synchronize:
-        src: '{{ ansible_user_dir }}/workspace/'
-        dest: '{{ zuul.executor.log_root }}/tox'
-        mode: pull
-        copy_links: true
-        verify_host: true
-        rsync_opts:
-          - --include=/.tox/*/log/*
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
diff --git a/playbooks/legacy/bindep-fallback/run.yaml b/playbooks/legacy/bindep-fallback/run.yaml
deleted file mode 100644
index 6033e783..00000000
--- a/playbooks/legacy/bindep-fallback/run.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-bindep-fallback from old job gate-{name}-bindep-fallback-ubuntu-xenial
-  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
-          # use the fallback list instead of existing bindep.txt
-          export PACKAGES=/usr/local/jenkins/common_data/bindep-fallback.txt
-          if [ "$ZUUL_PROJECT" == "openstack-infra/bindep" ] ; then
-              # if testing a change to bindep, use its entrypoint
-              virtualenv bindep-env
-              bindep-env/bin/pip install -U .
-              export BINDEP=bindep-env/bin/bindep
-          elif [ "$ZUUL_PROJECT" == "openstack-infra/project-config" ] ; then
-              # if testing a change to project-config, use its fallback list
-              export PACKAGES=jenkins/data/bindep-fallback.txt
-          fi
-          /usr/local/jenkins/slave_scripts/install-distro-packages.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 4cd681b1..c6fe8999 100644
--- a/zuul.d/zuul-legacy-jobs.yaml
+++ b/zuul.d/zuul-legacy-jobs.yaml
@@ -116,47 +116,6 @@
     post-run: playbooks/legacy/beaker-nodepool-rake/post.yaml
     timeout: 1800
 
-- job:
-    name: legacy-bindep-fallback
-    parent: legacy-base
-    run: playbooks/legacy/bindep-fallback/run.yaml
-    post-run: playbooks/legacy/bindep-fallback/post.yaml
-
-- job:
-    name: legacy-bindep-fallback-centos-7
-    parent: legacy-base
-    run: playbooks/legacy/bindep-fallback-centos-7/run.yaml
-    post-run: playbooks/legacy/bindep-fallback-centos-7/post.yaml
-    nodeset: legacy-centos-7
-
-- job:
-    name: legacy-bindep-fallback-debian-jessie
-    parent: legacy-base
-    run: playbooks/legacy/bindep-fallback-debian-jessie/run.yaml
-    post-run: playbooks/legacy/bindep-fallback-debian-jessie/post.yaml
-    nodeset: legacy-debian-jessie
-
-- job:
-    name: legacy-bindep-fallback-fedora-26
-    parent: legacy-base
-    run: playbooks/legacy/bindep-fallback-fedora-26/run.yaml
-    post-run: playbooks/legacy/bindep-fallback-fedora-26/post.yaml
-    nodeset: legacy-fedora-26
-
-- job:
-    name: legacy-bindep-fallback-opensuse-423
-    parent: legacy-base
-    run: playbooks/legacy/bindep-fallback-opensuse-423/run.yaml
-    post-run: playbooks/legacy/bindep-fallback-opensuse-423/post.yaml
-    nodeset: legacy-opensuse-423
-
-- job:
-    name: legacy-bindep-fallback-ubuntu-trusty
-    parent: legacy-base
-    run: playbooks/legacy/bindep-fallback-ubuntu-trusty/run.yaml
-    post-run: playbooks/legacy/bindep-fallback-ubuntu-trusty/post.yaml
-    nodeset: legacy-ubuntu-trusty
-
 - job:
     name: legacy-brick-cinderclient-ext-dsvm-functional
     parent: legacy-dsvm-base
diff --git a/zuul.d/zuul-legacy-project-templates.yaml b/zuul.d/zuul-legacy-project-templates.yaml
index 3332d359..60f74f1c 100644
--- a/zuul.d/zuul-legacy-project-templates.yaml
+++ b/zuul.d/zuul-legacy-project-templates.yaml
@@ -72,25 +72,6 @@
         - build-openstack-sphinx-docs
         - openstack-tox-linters
 
-- project-template:
-    name: bindep-fallback
-    check:
-      jobs:
-        - legacy-bindep-fallback-centos-7
-        - legacy-bindep-fallback-fedora-26
-        - legacy-bindep-fallback-debian-jessie
-        - legacy-bindep-fallback-opensuse-423
-        - legacy-bindep-fallback-ubuntu-trusty
-        - legacy-bindep-fallback
-    gate:
-      jobs:
-        - legacy-bindep-fallback-centos-7
-        - legacy-bindep-fallback-fedora-26
-        - legacy-bindep-fallback-debian-jessie
-        - legacy-bindep-fallback-opensuse-423
-        - legacy-bindep-fallback-ubuntu-trusty
-        - legacy-bindep-fallback
-
 - project-template:
     name: build-only-specs-jobs
     check: