diff --git a/.gitmodules b/.gitmodules
index 1866b11..7e8d0b9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -122,13 +122,13 @@
 	url = https://github.com/roles-ansible/ansible_role_packages.git
 [submodule "collections/ansible_collections/prometheus/prometheus"]
 	path = collections/ansible_collections/prometheus/prometheus
-	url = https://github.com/prometheus-community/ansible
+	url = https://github.com/prometheus-community/ansible.git
 [submodule "collections/ansible_collections/community/grafana"]
 	path = collections/ansible_collections/community/grafana
-	url = https://github.com/ansible-collections/community.grafana
+	url = https://github.com/ansible-collections/community.grafana.git
 [submodule "collections/ansible_collections/grafana/grafana"]
 	path = collections/ansible_collections/grafana/grafana
-	url = https://github.com/grafana/grafana-ansible-collection
+	url = https://github.com/grafana/grafana-ansible-collection.git
 [submodule "roles/unattended_upgrades"]
 	path = roles/unattended_upgrades
 	url = https://github.com/hifis-net/ansible-role-unattended-upgrades.git
@@ -137,4 +137,7 @@
 	url = https://github.com/ansible-collections/community.general.git
 [submodule "roles/l3d.nginx_exporter"]
 	path = roles/l3d.nginx_exporter
-	url = https://github.com/roles-ansible/ansible_role_nginx_exporter
+	url = https://github.com/roles-ansible/ansible_role_nginx_exporter.git
+[submodule "collections/ansible_collections/l3d/time"]
+	path = collections/ansible_collections/l3d/time
+	url = https://github.com/roles-ansible/ansible_collection_time.git
diff --git a/collections/ansible_collections/community/general b/collections/ansible_collections/community/general
index d9f3e7a..838e4e3 160000
--- a/collections/ansible_collections/community/general
+++ b/collections/ansible_collections/community/general
@@ -1 +1 @@
-Subproject commit d9f3e7a2ec701d9dc136f946d146994db2327778
+Subproject commit 838e4e3f0230a89e35e7f10a54f3e7d56f4cb50d
diff --git a/collections/ansible_collections/community/grafana b/collections/ansible_collections/community/grafana
index ff49e95..7f05682 160000
--- a/collections/ansible_collections/community/grafana
+++ b/collections/ansible_collections/community/grafana
@@ -1 +1 @@
-Subproject commit ff49e951e5656ce3298fd7e958fb9845add59193
+Subproject commit 7f056829debba911396d4eb659839195bad8afd4
diff --git a/collections/ansible_collections/grafana/grafana b/collections/ansible_collections/grafana/grafana
index d6d468c..1a36a90 160000
--- a/collections/ansible_collections/grafana/grafana
+++ b/collections/ansible_collections/grafana/grafana
@@ -1 +1 @@
-Subproject commit d6d468ce8f4d1ddd25a669c4177f3f194377bc92
+Subproject commit 1a36a90133357b64cd9492b5c96151f6a19e97b8
diff --git a/collections/ansible_collections/l3d/time b/collections/ansible_collections/l3d/time
new file mode 160000
index 0000000..1a200d3
--- /dev/null
+++ b/collections/ansible_collections/l3d/time
@@ -0,0 +1 @@
+Subproject commit 1a200d3fb93c0ee1745e5a62f93ac0e27f63482a
diff --git a/collections/ansible_collections/prometheus/prometheus b/collections/ansible_collections/prometheus/prometheus
index 292e433..214f7ed 160000
--- a/collections/ansible_collections/prometheus/prometheus
+++ b/collections/ansible_collections/prometheus/prometheus
@@ -1 +1 @@
-Subproject commit 292e4332fb9f381aa169c6b0fb8bd08af355fb46
+Subproject commit 214f7eda39080beaa4db248597db16bee3c22623
diff --git a/host_vars/mail01.l3d.space/vars.yml b/host_vars/mail01.l3d.space/vars.yml
index 970ee2e..af34209 100644
--- a/host_vars/mail01.l3d.space/vars.yml
+++ b/host_vars/mail01.l3d.space/vars.yml
@@ -116,6 +116,9 @@ fail2ban_jail_configuration:
 
 nginx__infrastructure_domain__enabled: false
 
+# l3d.time.ntp
+ntp_statistics: true
+
 # l3d.nginx_exporter
 nginx_exporter_listen_address: '127.0.0.1:9113'
 nginx_exporter_scrape_uri: 'https://node-exporter.mail01.l3d.space/nginx_status'
diff --git a/roles/geerlingguy.mysql b/roles/geerlingguy.mysql
index 8f0eef9..8c87b67 160000
--- a/roles/geerlingguy.mysql
+++ b/roles/geerlingguy.mysql
@@ -1 +1 @@
-Subproject commit 8f0eef93c743ef38a9252a1d6d61e7fb83d1cfcd
+Subproject commit 8c87b67ea9f3314a504a9c0ce217a3c2710c17c1
diff --git a/roles/robertdebock.dovecot b/roles/robertdebock.dovecot
index b30cc59..f77691f 160000
--- a/roles/robertdebock.dovecot
+++ b/roles/robertdebock.dovecot
@@ -1 +1 @@
-Subproject commit b30cc599bf1fccbf4882a128506ea3dc70339209
+Subproject commit f77691f2b9446d0eca9f9106aa2c4ba46e92137f
diff --git a/roles/robertdebock.fail2ban b/roles/robertdebock.fail2ban
index 5ca9f2b..6f042ae 160000
--- a/roles/robertdebock.fail2ban
+++ b/roles/robertdebock.fail2ban
@@ -1 +1 @@
-Subproject commit 5ca9f2ba7591f1e44823d562017e254564d22bf6
+Subproject commit 6f042aefcec7d59e40994631136fe53b9fba0130
diff --git a/roles/unattended_upgrades b/roles/unattended_upgrades
index c0d0c56..f39db96 160000
--- a/roles/unattended_upgrades
+++ b/roles/unattended_upgrades
@@ -1 +1 @@
-Subproject commit c0d0c569ebef916fe0bbb5cfa5e3f1bbd7a28751
+Subproject commit f39db96bd7d71d75838070f0d1305a8f91ee6ef7
diff --git a/site.yml b/site.yml
index 5fa1ed9..cf050e1 100644
--- a/site.yml
+++ b/site.yml
@@ -13,7 +13,7 @@
     - {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]}
-    - {role: do1jlr.ntp, tags: [ntp]}
+    - {role: l3d.time.ntp, tags: [ntp]}
     - {role: prometheus.prometheus.node_exporter, tags: [monitoring, node_exporter]}
 
 - name: User specific roles for all hosts