diff --git a/playbooks/legacy/beaker-localhost-rake/post.yaml b/playbooks/legacy/beaker-localhost-rake/post.yaml
deleted file mode 100644
index f6a22a67..00000000
--- a/playbooks/legacy/beaker-localhost-rake/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=/coverage/**
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
diff --git a/playbooks/legacy/beaker-localhost-rake/run.yaml b/playbooks/legacy/beaker-localhost-rake/run.yaml
deleted file mode 100644
index 531d1215..00000000
--- a/playbooks/legacy/beaker-localhost-rake/run.yaml
+++ /dev/null
@@ -1,66 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-beaker-localhost-rake from old job gate-beaker-localhost-rake
-  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 -x
-          sudo rm -f /etc/sudoers.d/zuul
-          # Prove that general sudo access is actually revoked
-          ! sudo -n true
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          mkdir .bundled_gems
-          export GEM_HOME=`pwd`/.bundled_gems
-          bundle install
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          mkdir -p .bundled_gems
-          export GEM_HOME=`pwd`/.bundled_gems
-          bundle exec rake
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/beaker-nodepool-rake/post.yaml b/playbooks/legacy/beaker-nodepool-rake/post.yaml
deleted file mode 100644
index f6a22a67..00000000
--- a/playbooks/legacy/beaker-nodepool-rake/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=/coverage/**
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
diff --git a/playbooks/legacy/beaker-nodepool-rake/run.yaml b/playbooks/legacy/beaker-nodepool-rake/run.yaml
deleted file mode 100644
index e6ba6f29..00000000
--- a/playbooks/legacy/beaker-nodepool-rake/run.yaml
+++ /dev/null
@@ -1,66 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-beaker-nodepool-rake from old job gate-beaker-nodepool-rake
-  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 -x
-          sudo rm -f /etc/sudoers.d/zuul
-          # Prove that general sudo access is actually revoked
-          ! sudo -n true
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          mkdir .bundled_gems
-          export GEM_HOME=`pwd`/.bundled_gems
-          bundle install
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          mkdir -p .bundled_gems
-          export GEM_HOME=`pwd`/.bundled_gems
-          bundle exec rake
-        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 eb9f429a..2f804c49 100644
--- a/zuul.d/zuul-legacy-jobs.yaml
+++ b/zuul.d/zuul-legacy-jobs.yaml
@@ -43,20 +43,6 @@
       - openstack/python-barbicanclient
       - openstack/tempest
 
-- job:
-    name: legacy-beaker-localhost-rake
-    parent: legacy-base
-    run: playbooks/legacy/beaker-localhost-rake/run.yaml
-    post-run: playbooks/legacy/beaker-localhost-rake/post.yaml
-    timeout: 1800
-
-- job:
-    name: legacy-beaker-nodepool-rake
-    parent: legacy-base
-    run: playbooks/legacy/beaker-nodepool-rake/run.yaml
-    post-run: playbooks/legacy/beaker-nodepool-rake/post.yaml
-    timeout: 1800
-
 - job:
     name: legacy-cloudkitty-dsvm-install
     parent: legacy-dsvm-base