diff --git a/playbooks/base-test/pre.yaml b/playbooks/base-test/pre.yaml
index fe1ec46..60e4a21 100644
--- a/playbooks/base-test/pre.yaml
+++ b/playbooks/base-test/pre.yaml
@@ -2,10 +2,10 @@
   roles:
     - emit-job-header
     - log-inventory
-    - add-build-sshkey
-    - start-zuul-console
-    - ensure-output-dirs
 
 - hosts: all
   roles:
+    - add-build-sshkey
+    - start-zuul-console
+    - ensure-output-dirs
     - prepare-workspace-git
diff --git a/playbooks/base/pre.yaml b/playbooks/base/pre.yaml
index fe1ec46..60e4a21 100644
--- a/playbooks/base/pre.yaml
+++ b/playbooks/base/pre.yaml
@@ -2,10 +2,10 @@
   roles:
     - emit-job-header
     - log-inventory
-    - add-build-sshkey
-    - start-zuul-console
-    - ensure-output-dirs
 
 - hosts: all
   roles:
+    - add-build-sshkey
+    - start-zuul-console
+    - ensure-output-dirs
     - prepare-workspace-git