diff --git a/playbooks/jenkins_master.yml b/playbooks/jenkins_master.yml
index 421c09d7e7..326477599d 100644
--- a/playbooks/jenkins_master.yml
+++ b/playbooks/jenkins_master.yml
@@ -72,6 +72,11 @@
     tags:
     - config
 
+  - name: add jenkins ssh priv key so it can connect to clients
+    action: copy src=$private/files/jenkins/ssh/jenkins_master dest=/root/.ssh/id_rsa mode=600
+    tags:
+    - config
+
 ## Missing:
 # Configuration of file jenkins : config.xml
 #   config.xml changes according to: 
diff --git a/playbooks/jenkins_slave.yml b/playbooks/jenkins_slave.yml
index b1729c656e..4ffd6d86c9 100644
--- a/playbooks/jenkins_slave.yml
+++ b/playbooks/jenkins_slave.yml
@@ -53,9 +53,13 @@
     - config
   
   - name: setup jenkins_slave user
-    action: user name=jenkins_slave state=present createhome=yes system=no password=${jenkins_slave_pw}
+    action: user name=jenkins_slave state=present createhome=yes system=no
     tags:
     - jenkinsuser  
+
+  - name: setup jenkins_slave ssh key
+    action: authorized_key user=jenkins_slave key='$FILE($private/files/jenkins/ssh/jenkins_master.pub)'
+
   - name: jenkins_slave to mock group
     action: user name=jenkins_slave groups=mock