diff --git a/evolinux-base/defaults/main.yml b/evolinux-base/defaults/main.yml
index 90ed4975..bf33a1a9 100644
--- a/evolinux-base/defaults/main.yml
+++ b/evolinux-base/defaults/main.yml
@@ -103,7 +103,8 @@ evolinux_system_locales: True
 
 evolinux_system_set_timezone: True
 evolinux_system_timezone: "Europe/Paris"
-evolinux_system_include_ntpd: true
+evolinux_system_include_ntpd: False
+evolinux_system_include_timesyncd: True
 
 evolinux_system_vim_skip_defaults: True
 evolinux_system_vim_default_editor: True
@@ -232,4 +233,4 @@ evolinux_cron_checkhpraid_frequency: daily
 evolinux_motd_include: True
 
 # Utils
-evolinux_utils_include: True
\ No newline at end of file
+evolinux_utils_include: True
diff --git a/timesyncd/defaults/main.yml b/timesyncd/defaults/main.yml
new file mode 100644
index 00000000..7fb5bcf4
--- /dev/null
+++ b/timesyncd/defaults/main.yml
@@ -0,0 +1,3 @@
+---
+ntp_servers:
+- 'ntp.evolix.net'
diff --git a/timesyncd/handlers/main.yml b/timesyncd/handlers/main.yml
new file mode 100644
index 00000000..904e3471
--- /dev/null
+++ b/timesyncd/handlers/main.yml
@@ -0,0 +1,5 @@
+---
+- name: Restart timesyncd
+  ansible.builtin.service:
+    name: systemd-timesyncd.service
+    state: restarted
diff --git a/timesyncd/tasks/main.yml b/timesyncd/tasks/main.yml
new file mode 100644
index 00000000..3417f678
--- /dev/null
+++ b/timesyncd/tasks/main.yml
@@ -0,0 +1,30 @@
+---
+- name: Install systemd-timesyncd package
+  ansible.builtin.apt:
+    name: systemd-timesyncd
+    state: present
+  tags:
+  - timesyncd
+
+- name: Remove openntpd package
+  ansible.builtin.apt:
+    name: openntpd
+    state: absent
+  tags:
+  - timesyncd
+
+- name: Remove ntp package
+  ansible.builtin.apt:
+    name: ntp
+    state: absent
+  tags:
+  - timesyncd
+
+- name: Copy timesyncd config
+  ansible.builtin.template:
+    src: timesyncd.conf.j2
+    dest: /etc/systemd/timesyncd.conf.d/evolix.conf
+    mode: "0644"
+  notify: Restart timesyncd
+  tags:
+  - timesyncd
diff --git a/timesyncd/templates/timesyncd.conf.j2 b/timesyncd/templates/timesyncd.conf.j2
new file mode 100644
index 00000000..93d22569
--- /dev/null
+++ b/timesyncd/templates/timesyncd.conf.j2
@@ -0,0 +1,3 @@
+# {{ ansible_managed }}
+[Time]
+NTP="{{ ntp_servers | join(' ') }}"