diff --git a/playbooks/legacy/barbican-simple-crypto-dsvm-tempest-castellan-from-git/post.yaml b/playbooks/legacy/barbican-simple-crypto-dsvm-tempest-castellan-from-git/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/barbican-simple-crypto-dsvm-tempest-castellan-from-git/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=/logs/**
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
diff --git a/playbooks/legacy/barbican-simple-crypto-dsvm-tempest-castellan-from-git/run.yaml b/playbooks/legacy/barbican-simple-crypto-dsvm-tempest-castellan-from-git/run.yaml
deleted file mode 100644
index eb15cc0f..00000000
--- a/playbooks/legacy/barbican-simple-crypto-dsvm-tempest-castellan-from-git/run.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-barbican-simple-crypto-dsvm-tempest-castellan-from-git
-    from old job gate-barbican-simple-crypto-dsvm-tempest-castellan-from-git-ubuntu-xenial-nv
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat > clonemap.yaml << EOF
-          clonemap:
-            - name: openstack-infra/devstack-gate
-              dest: devstack-gate
-          EOF
-          /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              git://git.openstack.org \
-              openstack-infra/devstack-gate
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_TEMPEST_REGEX=barbican
-          export KEEP_LOCALRC=1
-
-          export PROJECTS="openstack/barbican $PROJECTS"
-          export PROJECTS="openstack/python-barbicanclient $PROJECTS"
-          export PROJECTS="openstack/barbican-tempest-plugin $PROJECTS"
-          export DEVSTACK_LOCAL_CONFIG="enable_plugin barbican git://git.openstack.org/openstack/barbican"
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"export TEMPEST_PLUGINS='/opt/stack/new/barbican-tempest-plugin'"
-
-          export BRANCH_OVERRIDE=default
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          fi
-          # Add configuration values for enabling security features in local.conf
-          function pre_test_hook {
-              if [ -f $BASE/new/barbican-tempest-plugin/tools/pre_test_hook.sh ] ; then
-                  . $BASE/new/barbican-tempest-plugin/tools/pre_test_hook.sh
-              fi
-          }
-          export -f pre_test_hook
-
-          if [ "-castellan-from-git" == "-postgres" ] ; then
-              export DEVSTACK_GATE_POSTGRES=1
-          elif [ "-castellan-from-git" == "-castellan-from-git" ] ; then
-              export DEVSTACK_PROJECT_FROM_GIT="castellan"
-          elif [ "-castellan-from-git" == "-cursive" ] ; then
-              export DEVSTACK_PROJECT_FROM_GIT="cursive"
-          elif [ "-castellan-from-git" == "-py35" ] ; then
-             export DEVSTACK_GATE_USE_PYTHON3=True
-             export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service s-account"
-             export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service s-container"
-             export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service s-object"
-             export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service s-proxy"
-          fi
-
-          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
-
-          ./safe-devstack-vm-gate-wrap.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 26bf76c7..8e25bf62 100644
--- a/zuul.d/zuul-legacy-jobs.yaml
+++ b/zuul.d/zuul-legacy-jobs.yaml
@@ -11,21 +11,6 @@
     post-run: playbooks/legacy/astara-appliance-buildimage/post.yaml
     timeout: 1800
 
-- job:
-    name: legacy-barbican-simple-crypto-dsvm-tempest-castellan-from-git
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/barbican-simple-crypto-dsvm-tempest-castellan-from-git/run.yaml
-    post-run: playbooks/legacy/barbican-simple-crypto-dsvm-tempest-castellan-from-git/post.yaml
-    timeout: 4200
-    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/barbican
-      - openstack/barbican-tempest-plugin
-      - openstack/castellan
-      - openstack/cursive
-      - openstack/python-barbicanclient
-      - openstack/tempest
-
 - job:
     name: legacy-barbican-simple-crypto-dsvm-tempest-glance
     parent: legacy-dsvm-base