diff --git a/playbooks/base/post-logs.yaml b/playbooks/base/post-logs.yaml
index fcee733..b920f04 100644
--- a/playbooks/base/post-logs.yaml
+++ b/playbooks/base/post-logs.yaml
@@ -4,8 +4,3 @@
     - generate-zuul-manifest
     - role: upload-logs
       zuul_log_url: "http://localhost:8000"
-    - role: upload-logs-s3
-      zuul_log_bucket: "{{s3_config.bucket}}"
-      zuul_log_aws_access_key: "{{s3_config.access_key}}"
-      zuul_log_aws_secret_key: "{{s3_config.secret_key}}"
-      upload_logs_s3_endpoint: "{{s3_config.endpoint}}"
diff --git a/playbooks/base/post-ssh.yaml b/playbooks/base/post-ssh.yaml
index 2ae2ea6..d793838 100644
--- a/playbooks/base/post-ssh.yaml
+++ b/playbooks/base/post-ssh.yaml
@@ -1,3 +1,3 @@
 - hosts: all
-  ignore_errors: yes
-  roles: []
+  roles:
+    - remove-build-sshkey
diff --git a/playbooks/base/pre.yaml b/playbooks/base/pre.yaml
index c3f0815..a5a3f4f 100644
--- a/playbooks/base/pre.yaml
+++ b/playbooks/base/pre.yaml
@@ -1,4 +1,4 @@
 - hosts: all
   roles:
-    - start-zuul-console
+    - add-build-sshkey
     - prepare-workspace