diff --git a/playbooks/base/post-ssh.yaml b/playbooks/base/post-ssh.yaml
deleted file mode 100644
index d793838ce..000000000
--- a/playbooks/base/post-ssh.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-- hosts: all
-  roles:
-    - remove-build-sshkey
diff --git a/playbooks/base/pre.yaml b/playbooks/base/pre.yaml
deleted file mode 100644
index d0b31210a..000000000
--- a/playbooks/base/pre.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-- hosts: all
-  roles:
-    - add-build-sshkey
-    - multi-node-known-hosts
-    - prepare-workspace
-    - role: validate-host
-      # TODO(mordred) When we have site-local variables, these should go there
-      zuul_traceroute_host: git.openstack.org
-      zuul_image_manifest: /etc/dib-builddate.txt