diff --git a/tasks/groups.yml b/tasks/groups.yml
index 32162dc..16f5661 100644
--- a/tasks/groups.yml
+++ b/tasks/groups.yml
@@ -1,23 +1,25 @@
 ---
 
 - name: Setup the system departments (department)
+  become: yes
   group:
-    name: "{{item.1}}"
-    state: "{{item.0.state}}"
-    gid: "{{item.0.gid|default(omit)}}"
-    system: "{{item.0.system|default(false)}}"
+    name: "{{ item.1 }}"
+    state: "{{ item.0.state }}"
+    gid: "{{ item.0.gid | default(omit) }}"
+    system: "{{ item.0.system | default(false) }}"
   with_subelements:
-    - autologic_system_users
+    - "{{ autologic_system_users }}"
     - departments
   when: autologic_department_pattern and item.1 in autologic_department_access
 
 - name: Setup the system departments (basic)
+  become: yes
   group:
-    name: "{{item.1}}"
-    state: "{{item.0.state}}"
-    gid: "{{item.0.gid|default(omit)}}"
-    system: "{{item.0.system|default(false)}}"
+    name: "{{ item.1 }}"
+    state: "{{ item.0.state }}"
+    gid: "{{ item.0.gid | default(omit) }}"
+    system: "{{ item.0.system | default(false) }}"
   with_subelements:
-    - autologic_system_users
+    - "{{ autologic_system_users }}"
     - departments
   when: not autologic_department_pattern
diff --git a/tasks/sudo.yml b/tasks/sudo.yml
index 34e00a9..cdcf884 100644
--- a/tasks/sudo.yml
+++ b/tasks/sudo.yml
@@ -1,9 +1,10 @@
 ---
 
 - name: Create sudoers file
+  become: yes
   template:
-    src: "autologic-sudo-group.j2"
-    dest: "/etc/sudoers.d/autologic-sudoers"
+    src: autologic-sudo-group.j2
+    dest: /etc/sudoers.d/autologic-sudoers
     mode: 600
-    owner: "root"
-    group: "root"
+    owner: root
+    group: root
diff --git a/tasks/users.yml b/tasks/users.yml
index d692c89..15bcc93 100644
--- a/tasks/users.yml
+++ b/tasks/users.yml
@@ -1,23 +1,24 @@
 ---
 
 - name: Add the system users (basic)
+  become: yes
   user:
-    name:     "{{item.value.username}}"
-    state:    "{{item.value.state}}"
-    system:   "{{item.value.system|default(false)}}"
-    comment:  "{{item.value.comment|default(omit)}}"
-    uid:      "{{item.value.uid|default(omit)}}"
-    home:     "{{item.value.home|default(omit)}}"
-    group:    "{{item.value.group|default(omit)}}"
-    groups:   "{{item.value.departments|default([])|join(',')}}"
-    remove:   "{{item.value.remove|default(false)}}"
-    force:    "{{item.value.force|default(false)}}"
-  with_dict:  autologic_system_users
+    name: "{{ item.value.username }}"
+    state: "{{ item.value.state }}"
+    system: "{{ item.value.system | default(false) }}"
+    comment: "{{ item.value.comment | default(omit) }}"
+    uid: "{{ item.value.uid | default(omit) }}"
+    home: "{{ item.value.home | default(omit) }}"
+    group: "{{ item.value.group | default(omit) }}"
+    groups: "{{ item.value.departments | default([]) | join(',') }}"
+    remove: "{{ item.value.remove | default(false) }}"
+    force: "{{ item.value.force | default(false) }}"
+  with_dict: "{{ autologic_system_users }}"
 
 - name: Add user's SSH keys (basic)
   authorized_key:
-    user:     "{{item.value.username}}"
-    key:      "{{lookup('file', 'files/sshkeys/' + item.value.username)}}"
-    state:    "{{item.value.state}}"
-  with_dict: autologic_system_users
-  when: autologic_manage_sshkeys and item.value.state != 'absent'
\ No newline at end of file
+    user: "{{ item.value.username }}"
+    key: "{{ lookup('file', 'files/sshkeys/' + item.value.username) }}"
+    state: "{{ item.value.state }}"
+  with_dict: "{{ autologic_system_users }}"
+  when: autologic_manage_sshkeys and item.value.state != 'absent'
diff --git a/tasks/users_department_pattern.yml b/tasks/users_department_pattern.yml
index c9c86c6..838a435 100644
--- a/tasks/users_department_pattern.yml
+++ b/tasks/users_department_pattern.yml
@@ -1,53 +1,55 @@
 ---
 
 - name: Add the system users (department)
+  become: yes
   user:
-    name:     "{{item.0.username}}"
-    state:    "{{item.0.state}}"
-    system:   "{{item.0.system|default(false)}}"
-    comment:  "{{item.0.comment|default(omit)}}"
-    uid:      "{{item.0.uid|default(omit)}}"
-    home:     "{{item.0.home|default(omit)}}"
-    group:    "{{item.0.group|default(omit)}}"
-    groups:   "{{item.0.departments|default([])|join(',')}}"
-    remove:   "{{item.0.remove|default(false)}}"
-    force:    "{{item.0.force|default(false)}}"
+    name: "{{ item.0.username }}"
+    state: "{{ item.0.state }}"
+    system: "{{ item.0.system | default(false) }}"
+    comment: "{{ item.0.comment | default(omit) }}"
+    uid: "{{ item.0.uid | default(omit) }}"
+    home: "{{ item.0.home | default(omit) }}"
+    group: "{{ item.0.group | default(omit) }}"
+    groups: "{{ item.0.departments | default([]) | join(',') }}"
+    remove: "{{ item.0.remove | default(false) }}"
+    force: "{{ item.0.force | default(false) }}"
   register: valid_users
   with_subelements:
-    - autologic_system_users
+    - "{{ autologic_system_users }}"
     - departments
   when: item.1 in autologic_department_access
 
 - name: Add user's SSH keys (department)
   authorized_key:
-    user:   "{{item.1.username}}"
-    key:    "{{lookup('file', 'files/sshkeys/' + item.1.username)}}"
-    state:  "{{item.0.state}}"
+    user: "{{ item.1.username }}"
+    key: "{{ lookup('file', 'files/sshkeys/' + item.1.username) }}"
+    state:  "{{ item.0.state }}"
   with_subelements:
-    - valid_users.results
+    - "{{ valid_users.results }}"
     - item
   when: autologic_manage_sshkeys and item.0.state != 'absent' and item.1.username is defined
 
 - name: Add the system users (user)
+  become: yes
   user:
-    name:     "{{item.value.username}}"
-    state:    "{{item.value.state}}"
-    system:   "{{item.value.system|default(false)}}"
-    comment:  "{{item.value.comment|default(omit)}}"
-    uid:      "{{item.value.uid|default(omit)}}"
-    home:     "{{item.value.home|default(omit)}}"
-    group:    "{{item.value.group|default(omit)}}"
-    groups:   "{{item.value.departments|default([])|join(',')}}"
-    remove:   "{{item.value.remove|default(false)}}"
-    force:    "{{item.value.force|default(false)}}"
-  with_dict: autologic_system_users
+    name: "{{ item.value.username }}"
+    state: "{{ item.value.state }}"
+    system: "{{ item.value.system | default(false) }}"
+    comment: "{{ item.value.comment | default(omit) }}"
+    uid: "{{ item.value.uid | default(omit) }}"
+    home: "{{ item.value.home | default(omit) }}"
+    group: "{{ item.value.group | default(omit) }}"
+    groups: "{{ item.value.departments | default([]) | join(',') }}"
+    remove: "{{ item.value.remove | default(false) }}"
+    force: "{{ item.value.force | default(false) }}"
+  with_dict: "{{ autologic_system_users }}"
   when: item.value.username in autologic_user_access
 
 - name: Add user's SSH keys (user)
   authorized_key:
-    user:     "{{item.value.username}}"
-    key:      "{{lookup('file', 'files/sshkeys/' + item.value.username)}}"
-    state:    "{{item.value.state}}"
-  with_dict: autologic_system_users
+    user: "{{ item.value.username }}"
+    key: "{{ lookup('file', 'files/sshkeys/' + item.value.username) }}"
+    state: "{{ item.value.state }}"
+  with_dict: "{{ autologic_system_users }}"
   when: autologic_manage_sshkeys and item.value.username in autologic_user_access and item.value.state != 'absent'