diff --git a/playbooks/base/post-ssh.yaml b/playbooks/base/post-ssh.yaml
index cc0fe07..2ae2ea6 100644
--- a/playbooks/base/post-ssh.yaml
+++ b/playbooks/base/post-ssh.yaml
@@ -1,4 +1,3 @@
 - hosts: all
   ignore_errors: yes
-  roles:
-    - remove-build-sshkey
+  roles: []
diff --git a/playbooks/base/pre.yaml b/playbooks/base/pre.yaml
index a3b0572..c3f0815 100644
--- a/playbooks/base/pre.yaml
+++ b/playbooks/base/pre.yaml
@@ -1,5 +1,4 @@
 - hosts: all
   roles:
-    - add-build-sshkey
     - start-zuul-console
     - prepare-workspace