diff --git a/.gitmodules b/.gitmodules
index a95c1bd..828c29f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -27,7 +27,7 @@
 	url = https://github.com/DO1JLR/role_nextcloud_client.git
 	branch = master
 [submodule "roles/ntp"]
-	path = roles/ntp
+	path = roles/l3d.ntp
 	url = https://github.com/roles-ansible/ansible_role_ntp.git
 	branch = main
 [submodule "roles/arch-fonts"]
@@ -71,7 +71,7 @@
 	url = https://github.com/roles-ansible/ansible_role_base.git
 	branch = main
 [submodule "roles/bat"]
-	path = roles/bat
+	path = roles/gantsign.bat
 	url = https://github.com/gantsign/ansible_role_bat.git
 	branch = master
 [submodule "roles/amdgpu_firmware"]
diff --git a/roles/bat b/roles/gantsign.bat
similarity index 100%
rename from roles/bat
rename to roles/gantsign.bat
diff --git a/roles/l3d.ntp b/roles/l3d.ntp
new file mode 160000
index 0000000..89c62be
--- /dev/null
+++ b/roles/l3d.ntp
@@ -0,0 +1 @@
+Subproject commit 89c62be2cb6bb5af79516b358ffcabda62b26a86
diff --git a/roles/ntp b/roles/ntp
deleted file mode 160000
index 8d33019..0000000
--- a/roles/ntp
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8d330190c4052981bdb146136dc7f41071a66289
diff --git a/site.yml b/site.yml
index 203d4d9..a349178 100644
--- a/site.yml
+++ b/site.yml
@@ -4,14 +4,15 @@
   roles:
     - {role: ansible_version, tags: always, gather_facts: false}
 
-- name: run do1jlr.base setup roles
+- name: Generic Workstation Preperation
   hosts: all
   roles:
     # - {role: do1jlr.base, tags: [default, packages, base]}
     # - {role: workstation_packages, tags: [default, workstation_packages, packages, setup]}
-    - {role: ntp, tags: ntp}
+    - {role: l3d.ntp, tags: ntp}
     - {role: do1jlr.avahi_client, tags: avahi}
     - {role: do1jlr.avahi_daemon, tags: avahi}
+    - {role: gantsign.bat, tags: bat}
     # - {role: arch-fonts, tags: [font, fonts, arch-fonts]}
 
 # - name: user specific setup