diff --git a/collections/ansible_collections/community/general b/collections/ansible_collections/community/general
index bc383b8..980fa36 160000
--- a/collections/ansible_collections/community/general
+++ b/collections/ansible_collections/community/general
@@ -1 +1 @@
-Subproject commit bc383b8f7bd3c4ef465507cad5e22076e7739489
+Subproject commit 980fa36facb2c103e2c16048aa209262dcf08950
diff --git a/collections/ansible_collections/l3d/users b/collections/ansible_collections/l3d/users
index 6362a56..0a1c76e 160000
--- a/collections/ansible_collections/l3d/users
+++ b/collections/ansible_collections/l3d/users
@@ -1 +1 @@
-Subproject commit 6362a56ad362c25bdcaa4fe16d6cae7662723737
+Subproject commit 0a1c76e21c82471e9da0366f7ab1201787156434
diff --git a/group_vars/all/vars.yml b/group_vars/all/vars.yml
index 00f05ed..c040445 100644
--- a/group_vars/all/vars.yml
+++ b/group_vars/all/vars.yml
@@ -29,17 +29,18 @@ l3d_users__default_users:
     shell: '/bin/bash'
     create_home: true
     admin: true
+    admin_nopassword: true
+    admin_commands: 'ALL'
     pubkeys: |
        ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPvvXN33GwkTF4ZOwPgF21Un4R2z9hWUuQt1qIfzQyhC
        ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAG65EdcM+JLv0gnzT9LcqVU47Pkw0SqiIg7XipXENi8
        ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJz7zEvUVgJJJsIgfG3izsqYcM22IaKz4jGVUbNRL2PX
-  - name: 'alice'
-    state: 'absent'
-    remove: true
 
 # l3d.users.user
-l3d_users_user__create_ansible: true
-l3d_users_user__set_ansible_ssh_keys: true
+l3d_users__create_ansible: true
+l3d_users__ansible_user_state: 'present'
+l3d_users__set_ansible_ssh_keys: true
+l3d_users__ansible_ssh_keys: "{{ lookup('url', 'https://github.com/do1jlr.keys', split_lines=False) }}"
 
 # do1jlr.users
 admins:
diff --git a/site.yml b/site.yml
index c720b2b..66f9c25 100644
--- a/site.yml
+++ b/site.yml
@@ -7,7 +7,9 @@
 - name: General roles for all hosts
   hosts: all
   roles:
-    - {role: l3d.users.user, tags: [usr]}
+    - {role: l3d.users.user, tags: [test, users, user]}
+    - {role: l3d.users.admin, tags: [test, users, admin]}
+    - {role: l3d.users.sshd, tags: [test, users, sshd]}
     - {role: l3d.packages, tags: [packages, general]}
     - {role: do1jlr.ranger, tags: [packages, ranger]}
     - {role: gantsign.bat, tags: [packages, bat], when: [ansible_os_family == 'Debian']}