diff --git a/.gitmodules b/.gitmodules
index bb97959..1f42f9b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -2,13 +2,13 @@
 	path = roles/do1jlr.base
 	url = https://github.com/roles-ansible/ansible_role_base.git
 [submodule "roles/ranger"]
-	path = roles/ranger
+	path = roles/do1jlr.ranger
 	url = https://github.com/roles-ansible/ansible_role_ranger.git
 [submodule "roles/bat"]
-	path = roles/bat
+	path = roles/gantsign.bat
 	url = https://github.com/gantsign/ansible_role_bat.git
 [submodule "roles/dotfiles"]
-	path = roles/dotfiles
+	path = roles/do1jlr.dotfiles
 	url = https://github.com/roles-ansible/ansible_role_dotfiles.git
 [submodule "roles/users"]
 	path = roles/do1jlr.users
@@ -22,15 +22,6 @@
 [submodule "files/ssh_public_keys"]
 	path = files/ssh_public_keys
 	url = https://backwesen.de/ansible/ssh_public_keys.git
-[submodule "roles/nginx2"]
-	path = roles/nginx2
-	url = git@git.ccczh.ch:ansible-roles/role-nginx_new2.git
-[submodule "roles/acmetool2"]
-	path = roles/acmetool2
-	url = git@git.ccczh.ch:ansible-roles/role-acmetool.git
-[submodule "roles/webhost2"]
-	path = roles/webhost2
-	url = git@git.ccczh.ch:ansible-roles/role-webhost.git
 [submodule "roles/geerlingguy.firewall"]
 	path = roles/geerlingguy.firewall
 	url = https://github.com/geerlingguy/ansible-role-firewall.git
diff --git a/hosts.ini b/hosts.ini
index 19bc908..160d378 100644
--- a/hosts.ini
+++ b/hosts.ini
@@ -4,11 +4,11 @@ web01.l3d.space
 [mail]
 mail01.l3d.space
 
-[home]
-luna.l3d.ch ansible_host=192.168.255.2
+# [home]
+# luna.l3d.ch ansible_host=luna.local
 
 [resolver]
-luna.l3d.ch ansible_host=192.168.255.2
+# luna.l3d.ch ansible_host=luna.local
 
 [resolver:children]
 mail
diff --git a/roles/acmetool2 b/roles/acmetool2
deleted file mode 160000
index b988f6d..0000000
--- a/roles/acmetool2
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b988f6d86354ff75904e4577f6ccd4f24f0b78c6
diff --git a/roles/bat b/roles/bat
deleted file mode 160000
index 2ebd39e..0000000
--- a/roles/bat
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 2ebd39e695471eedfb7980d51ffaeb8c9c30e947
diff --git a/roles/dotfiles b/roles/do1jlr.dotfiles
similarity index 100%
rename from roles/dotfiles
rename to roles/do1jlr.dotfiles
diff --git a/roles/ranger b/roles/do1jlr.ranger
similarity index 100%
rename from roles/ranger
rename to roles/do1jlr.ranger
diff --git a/roles/gantsign.bat b/roles/gantsign.bat
new file mode 160000
index 0000000..1b4d972
--- /dev/null
+++ b/roles/gantsign.bat
@@ -0,0 +1 @@
+Subproject commit 1b4d9721d1b6a0d1b0786fd5f46409df11b34d07
diff --git a/roles/geerlingguy.postgresql b/roles/geerlingguy.postgresql
index e7cd403..744ec93 160000
--- a/roles/geerlingguy.postgresql
+++ b/roles/geerlingguy.postgresql
@@ -1 +1 @@
-Subproject commit e7cd403506ded8dfcfb013e7c9b5c6b8d1ff8285
+Subproject commit 744ec937976a82bb993497b15228f5f4df7fdf86
diff --git a/roles/nginx2 b/roles/nginx2
deleted file mode 160000
index bb24239..0000000
--- a/roles/nginx2
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit bb242391f207f11f8ba443934a43bf00c6e837fe
diff --git a/roles/webhost2 b/roles/webhost2
deleted file mode 160000
index 7a17d4c..0000000
--- a/roles/webhost2
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7a17d4cdf5b524f52d36cc6c2f5b7ae08ae8feab
diff --git a/site.yml b/site.yml
index f30a704..ffd6d25 100644
--- a/site.yml
+++ b/site.yml
@@ -8,8 +8,8 @@
   hosts: all
   roles:
     - {role: do1jlr.base, tags: [default, packages, base]}
-    - {role: ranger, tags: [packages, ranger]}
-    - {role: bat, tags: [packages, bat], when: [ansible_os_family == 'Debian']}
+    - {role: do1jlr.ranger, tags: [packages, ranger]}
+    - {role: gantsign.bat, tags: [packages, bat], when: [ansible_os_family == 'Debian']}
     - {role: unattended_upgrades, tags: [default, unattended, unattended_upgrades, security], become: true, when: ansible_distribution == 'Debian'}
     - {role: do1jlr.rtl_nic_firmware, tags: [apu, rtl_nic, firmware]}
     - {role: do1jlr.avahi_client, tags: [avahi, avahi_client]}
@@ -19,7 +19,7 @@
   hosts: all
   roles:
     - {role: do1jlr.admin_base, tags: [default, init, users, accounts, dotfiles]}
-    - {role: dotfiles, tags: [default, dotfiles]}
+    - {role: do1jlr.dotfiles, tags: [default, dotfiles]}
     - {role: geerlingguy.firewall, tags: [default, firewall], become: true}
     - {role: robertdebock.fail2ban, tags: [default, fail2ban], become: true}