diff --git a/.gitmodules b/.gitmodules
index bc5e775..7bbaac9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -6,10 +6,10 @@
 	url = https://github.com/DO1JLR/ansible-role-i3wm.git
 [submodule "roles/dotfiles"]
 	path = roles/dotfiles
-	url = https://github.com/DO1JLR/role_dotfiles.git
+	url = https://github.com/chaos-bodensee/role_dotfiles.git
 [submodule "roles/pulseaudio"]
 	path = roles/pulseaudio
-	url = https://github.com/DO1JLR/role_pulseaudio_archlinux.git
+	url = https://github.com/chaos-bodensee/role_pulseaudio_archlinux.git
 [submodule "roles/authorized_keys"]
 	path = roles/authorized_keys
 	url = https://github.com/ffbsee/role-ssh_authorized_keys.git
@@ -30,7 +30,7 @@
 	url = https://github.com/DO1JLR/role-arch-fonts.git
 [submodule "roles/akku-warning"]
 	path = roles/akku-warning
-	url = https://github.com/DO1JLR/role_akku_warning.git
+	url = https://github.com/chaos-bodensee/role_akku_warning.git
 [submodule "roles/install-firefox"]
 	path = roles/install-firefox
 	url = https://github.com/DO1JLR/role-firefox-installation.git
diff --git a/roles/akku-warning b/roles/akku-warning
index e71341c..ce2be29 160000
--- a/roles/akku-warning
+++ b/roles/akku-warning
@@ -1 +1 @@
-Subproject commit e71341cbeaad3e8eb8a3a47a52afd89e4525a6a1
+Subproject commit ce2be294321a0578cecf91bfa2b15b190d645bb8
diff --git a/roles/authorized_keys b/roles/authorized_keys
index d33014e..47a87b0 160000
--- a/roles/authorized_keys
+++ b/roles/authorized_keys
@@ -1 +1 @@
-Subproject commit d33014e3c209c9904385cb6856af948047c10a23
+Subproject commit 47a87b06425ed0f055388a4426d6fb3684b0df7d
diff --git a/roles/dotfiles b/roles/dotfiles
index 1c25806..4f3004f 160000
--- a/roles/dotfiles
+++ b/roles/dotfiles
@@ -1 +1 @@
-Subproject commit 1c25806494ded16a32f5ed12f38862100ef39931
+Subproject commit 4f3004fc56720fdd71d105e6c9acd67a53477632
diff --git a/roles/pulseaudio b/roles/pulseaudio
index d54308e..f8ebd2c 160000
--- a/roles/pulseaudio
+++ b/roles/pulseaudio
@@ -1 +1 @@
-Subproject commit d54308ef1636d07b3c177495717d4dd9f0a0503f
+Subproject commit f8ebd2c89b1e7961eaab30ecf69985a17724a895
diff --git a/roles/sshd b/roles/sshd
index aa1156c..4fc48f3 160000
--- a/roles/sshd
+++ b/roles/sshd
@@ -1 +1 @@
-Subproject commit aa1156cd7b75bccda1fac7652a83e6f31499608b
+Subproject commit 4fc48f39b90be9f2751dde438f314529b3eb9691
diff --git a/roles/workstation_packages b/roles/workstation_packages
index e82d38e..3989d75 160000
--- a/roles/workstation_packages
+++ b/roles/workstation_packages
@@ -1 +1 @@
-Subproject commit e82d38e9131f0dcef6fb80d50228fec2c2c9b675
+Subproject commit 3989d75f4242193a5d07831796a3133912ea7343