diff --git a/roles/head-node/tasks/main.yml b/roles/head-node/tasks/main.yml
index 5f68d38..3eb2785 100644
--- a/roles/head-node/tasks/main.yml
+++ b/roles/head-node/tasks/main.yml
@@ -15,9 +15,15 @@
     force=yes
     update=yes
 
-- name: Ensure Ansible Roles
-  become_user: maas
-  command: cp -r /tmp/ansible.maas/{{ item }} /etc/maas/ansible owner=maas group=maas
+- name: Ensure Ansible Roles Exist
+  become: yes
+  command: cp -rf /tmp/ansible.maas/{{ item }} /etc/maas/ansible
+  with_items:
+    - roles
+
+- name: Ensure Ansible Roles Ownership
+  become: yes
+  file: dest=/etc/maas/ansible/{{ item }} owner=maas group=maas recurse=yes
   with_items:
     - roles