diff --git a/playbooks/pre-tobiko-devstack.yaml b/playbooks/pre-tobiko-devstack.yaml
index f5caa847a..10d1a312a 100644
--- a/playbooks/pre-tobiko-devstack.yaml
+++ b/playbooks/pre-tobiko-devstack.yaml
@@ -28,5 +28,15 @@
         group: stack
       become: yes
 
+
+- name: Setup Tobiko log directories
+  hosts: all
   roles:
     - setup_tobiko_logs_dir
+
+
+- name: Copy the build ssh key to authorized_keys on all hosts for stack
+  hosts: all
+  roles:
+    - role: copy-build-sshkey
+      copy_sshkey_target_user: stack