diff --git a/playbooks/base-test/pre.yaml b/playbooks/base-test/pre.yaml
index 8125025..ffb9a65 100644
--- a/playbooks/base-test/pre.yaml
+++ b/playbooks/base-test/pre.yaml
@@ -4,6 +4,12 @@
     - log-inventory
 
 - hosts: all
+  roles:
+    - add-build-sshkey
+    - start-zuul-console
+    - ensure-output-dirs
+
+- hosts: all
   tasks:
     - name: Update apt cache
       become: true
@@ -18,7 +24,4 @@
 
 - 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 8125025..ffb9a65 100644
--- a/playbooks/base/pre.yaml
+++ b/playbooks/base/pre.yaml
@@ -4,6 +4,12 @@
     - log-inventory
 
 - hosts: all
+  roles:
+    - add-build-sshkey
+    - start-zuul-console
+    - ensure-output-dirs
+
+- hosts: all
   tasks:
     - name: Update apt cache
       become: true
@@ -18,7 +24,4 @@
 
 - hosts: all
   roles:
-    - add-build-sshkey
-    - start-zuul-console
-    - ensure-output-dirs
     - prepare-workspace-git