diff --git a/roles/native-sudo/tasks/main.yml b/roles/native-sudo/tasks/main.yml
index 73655c6c..29e4b6b9 100644
--- a/roles/native-sudo/tasks/main.yml
+++ b/roles/native-sudo/tasks/main.yml
@@ -1,11 +1,4 @@
 - name: install sudo
-  pacman: name=sudo state=present
-
-- name: create sudoers
-  copy:
-    src:  sudoers
-    dest: /etc/sudoers
-    mode: "0440"
-    owner: root
-    group: root
-    backup: yes
+  package:
+    name:   sudo
+    state:  present
diff --git a/roles/native-user-administrator/tasks/main.yml b/roles/native-user-administrator/tasks/main.yml
index add46de5..cf0f11f7 100644
--- a/roles/native-user-administrator/tasks/main.yml
+++ b/roles/native-user-administrator/tasks/main.yml
@@ -3,6 +3,10 @@
     name: administrator
     update_password: on_create
     password: "{{ user_administrator_initial_password | password_hash('sha512') }}"
+    create_home: yes
+    generate_ssh_key: yes
+    ssh_key_type: rsa
+    ssh_key_bits: 8192
 
 - name: create /home/administrator/.ssh/authorized_keys
   copy: