diff --git a/roles/compute-node/tasks/main.yml b/roles/compute-node/tasks/main.yml
index 4c718cc..53c3c60 100644
--- a/roles/compute-node/tasks/main.yml
+++ b/roles/compute-node/tasks/main.yml
@@ -59,12 +59,11 @@
   register: private_key
 
 - name: Ensure SSH Key
-  become: yes
+  become: no
   copy:
     src=files/{{ item }}
-    dest=/home/{{ ansible_user }}/.ssh/{{ item }}
+    dest={{ ansible_env['PWD'] }}/.ssh/{{ item }}
     owner={{ ansible_user }}
-    group={{ ansible_user }}
     mode=0600
   with_items:
     - id_rsa
diff --git a/roles/maas/tasks/main.yml b/roles/maas/tasks/main.yml
index b8cc720..d947b34 100644
--- a/roles/maas/tasks/main.yml
+++ b/roles/maas/tasks/main.yml
@@ -317,7 +317,7 @@
 
 - name: Ensure SSH keys for Ansible
   become: yes
-  command: cp /home/{{ ansible_user }}/.ssh/id_rsa /etc/maas/ansible/id_rsa
+  command: cp {{ ansible_env['PWD'] }}/.ssh/id_rsa /etc/maas/ansible/id_rsa
 
 - name: Ensure SSH Key Permissions
   become: yes