diff --git a/collections/ansible_collections/community/general b/collections/ansible_collections/community/general
index eded6eb..bc383b8 160000
--- a/collections/ansible_collections/community/general
+++ b/collections/ansible_collections/community/general
@@ -1 +1 @@
-Subproject commit eded6ebf648bc0ff76bcff5ddaf1d99ee4384636
+Subproject commit bc383b8f7bd3c4ef465507cad5e22076e7739489
diff --git a/collections/ansible_collections/l3d/git b/collections/ansible_collections/l3d/git
index 6976e94..f62d67f 160000
--- a/collections/ansible_collections/l3d/git
+++ b/collections/ansible_collections/l3d/git
@@ -1 +1 @@
-Subproject commit 6976e9434e31290271290435d7872fa84c275f43
+Subproject commit f62d67fb66138593d2f999b0e7e68282f9871e5b
diff --git a/collections/ansible_collections/l3d/users b/collections/ansible_collections/l3d/users
index 1d54bbc..6362a56 160000
--- a/collections/ansible_collections/l3d/users
+++ b/collections/ansible_collections/l3d/users
@@ -1 +1 @@
-Subproject commit 1d54bbcb098ff1bcde073e11696f9e45b8c6cb99
+Subproject commit 6362a56ad362c25bdcaa4fe16d6cae7662723737
diff --git a/group_vars/all/vars.yml b/group_vars/all/vars.yml
index 3af8d4d..00f05ed 100644
--- a/group_vars/all/vars.yml
+++ b/group_vars/all/vars.yml
@@ -22,6 +22,25 @@ ntp_servers:
 # prometheus.prometeus.node_exporter
 node_exporter_web_listen_address: '127.0.0.1:9100'
 
+# l3d.users
+l3d_users__default_users:
+  - name: 'l3d'
+    state: 'present'
+    shell: '/bin/bash'
+    create_home: true
+    admin: true
+    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
+
 # do1jlr.users
 admins:
   - l3d
diff --git a/host_vars/services.l3d.ch/vars.yml b/host_vars/services.l3d.ch/vars.yml
index b69af99..9f74fa2 100644
--- a/host_vars/services.l3d.ch/vars.yml
+++ b/host_vars/services.l3d.ch/vars.yml
@@ -1,23 +1,9 @@
 ---
-users:
-  l3d:
-    - l3d@pinkie.l3d.yt
-    - l3d@mobile.l3d.yt
-    - l3d@backup.l3d.yt
-    - l3d@derpy.l3d.yt
-    - l3d@backup-rsa.l3d.yt
-    - l3d@business.wingcon.com
-  mxusr:
-    - l3d@pinkie.l3d.yt
-    - l3d@mobile.l3d.yt
-    - l3d@backup.l3d.yt
-    - l3d@derpy.l3d.yt
-    - l3d@backup-rsa.l3d.yt
-    - l3d@business.wingcon.com
-
-accounts:
-  - l3d
-  - mxusr
+l3d_users__local_users:
+  - name: 'mxusr'
+    state: 'present'
+    admin: false
+    pubkeys: "{{ lookup('url', 'https://github.com/do1jlr.keys', split_lines=False) }}"
 
 acme_domain_unwant_list: []
 #  - name: 'example.com'
diff --git a/site.yml b/site.yml
index 381dc7d..c720b2b 100644
--- a/site.yml
+++ b/site.yml
@@ -7,6 +7,7 @@
 - name: General roles for all hosts
   hosts: all
   roles:
+    - {role: l3d.users.user, tags: [usr]}
     - {role: l3d.packages, tags: [packages, general]}
     - {role: do1jlr.ranger, tags: [packages, ranger]}
     - {role: gantsign.bat, tags: [packages, bat], when: [ansible_os_family == 'Debian']}