diff --git a/.gitmodules b/.gitmodules
index 23a4947..727be01 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -11,7 +11,7 @@
 	path = roles/pulseaudio
 	url = https://github.com/chaos-bodensee/role_pulseaudio_archlinux.git
 [submodule "roles/authorized_keys"]
-	path = roles/authorized_keys
+	path = roles/do1jlr.auth
 	url = https://github.com/ffbsee/role-ssh_authorized_keys.git
 [submodule "files/admin_ssh_keys"]
 	path = files/admin_ssh_keys
@@ -44,7 +44,7 @@
 	path = roles/no-sleep
 	url = https://github.com/chaos-bodensee/role_disable_sleep.git
 [submodule "roles/manage_users"]
-	path = roles/manage_users
+	path = roles/do1jlr.users
 	url = https://github.com/chaos-bodensee/role-manage_users.git
 [submodule "roles/polybar"]
 	path = roles/polybar
diff --git a/roles/authorized_keys b/roles/do1jlr.auth
similarity index 100%
rename from roles/authorized_keys
rename to roles/do1jlr.auth
diff --git a/roles/do1jlr.users b/roles/do1jlr.users
new file mode 160000
index 0000000..4f37a11
--- /dev/null
+++ b/roles/do1jlr.users
@@ -0,0 +1 @@
+Subproject commit 4f37a11843ff4a18aa36fbdf31369e6b81e602c0
diff --git a/roles/manage_users b/roles/manage_users
deleted file mode 160000
index 26fc63d..0000000
--- a/roles/manage_users
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 26fc63d949b1d3859103ed4fcd1a66a787b83c43
diff --git a/setup_desk_minni.yml b/setup_desk_minni.yml
index f0c639a..1eee182 100644
--- a/setup_desk_minni.yml
+++ b/setup_desk_minni.yml
@@ -12,8 +12,8 @@
 - name: user and ssh(d) setup
   hosts: desk_minni.local
   roles:
-    - {role: manage_users, tags: [users, base]}
-    - {role: authorized_keys, tags: [auth, base]}
+    - {role: do1jlr.users, tags: [users, base]}
+    - {role: do1jlr.auth, tags: [auth, base]}
     - {role: do1jlr.sshd, tags: [sshd, base]}
     - {role: dotfiles, tags: [dotfiles, base]}
 
diff --git a/setup_l14.yml b/setup_l14.yml
index 979da35..674ee03 100644
--- a/setup_l14.yml
+++ b/setup_l14.yml
@@ -13,8 +13,8 @@
 - name: user and ssh(d) setup
   hosts: l14.local
   roles:
-    - {role: manage_users, tags: [users, base]}
-    - {role: authorized_keys, tags: [auth, base]}
+    - {role: do1jlr.users, tags: [users, base]}
+    - {role: do1jlr.auth, tags: [auth, base]}
     - {role: do1jlr.sshd, tags: [sshd, base]}
     - {role: dotfiles, tags: [dotfiles, base]}
 
diff --git a/setup_t460p.yml b/setup_t460p.yml
index 13a5627..81d1a49 100644
--- a/setup_t460p.yml
+++ b/setup_t460p.yml
@@ -12,8 +12,8 @@
 - name: user and ssh(d) setup
   hosts: t460p.local
   roles:
-    - {role: manage_users, tags: [users, base]}
-    - {role: authorized_keys, tags: [auth, base]}
+    - {role: do1jlr.users, tags: [users, base]}
+    - {role: do1jlr.auth, tags: [auth, base]}
     - {role: do1jlr.sshd, tags: [sshd, base]}
     - {role: dotfiles, tags: [dotfiles, base]}
 
diff --git a/setup_workstation.yml b/setup_workstation.yml
index 94119e0..0d81507 100644
--- a/setup_workstation.yml
+++ b/setup_workstation.yml
@@ -12,8 +12,8 @@
 - name: user and ssh(d) setup
   hosts: workstation.local
   roles:
-    - {role: manage_users, tags: [users, base]}
-    - {role: authorized_keys, tags: [auth, base]}
+    - {role: do1jlr.users, tags: [users, base]}
+    - {role: do1jlr.auth, tags: [auth, base]}
     - {role: do1jlr.sshd, tags: [sshd, base]}
     - {role: dotfiles, tags: [dotfiles, base]}