diff --git a/evolinux-base/defaults/main.yml b/evolinux-base/defaults/main.yml
index 6ac368fe..b3c2085b 100644
--- a/evolinux-base/defaults/main.yml
+++ b/evolinux-base/defaults/main.yml
@@ -78,7 +78,10 @@ evolinux_system_include: True
 
 evolinux_system_chmod_tmp: True
 evolinux_system_locales: True
+
+evolinux_system_set_timezone: True
 evolinux_system_timezone: "Europe/Paris"
+
 evolinux_system_vim_skip_defaults: true
 evolinux_system_vim_default_editor: True
 evolinux_system_profile: True
@@ -91,7 +94,9 @@ evolinux_system_cron_random: True
 evolinux_system_alert5_init: True
 evolinux_system_alert5_enable: True
 evolinux_system_eni_auto: True
-evolinux_system_ntp_server: False
+
+evolinux_system_set_ntpserver: True
+evolinux_system_ntpserver: "ntp.evolix.net"
 
 # root
 
diff --git a/evolinux-base/tasks/system.yml b/evolinux-base/tasks/system.yml
index 0a3a6495..53ce06c2 100644
--- a/evolinux-base/tasks/system.yml
+++ b/evolinux-base/tasks/system.yml
@@ -28,7 +28,7 @@
   timezone:
     name: "{{ evolinux_system_timezone | mandatory }}"
   notify: restart cron
-  when: evolinux_system_timezone
+  when: evolinux_system_set_timezone
 
 # TODO : find a way to force the console-data configuration
 # non-interactively (like tzdata ↑)
@@ -118,9 +118,9 @@
   replace:
     dest: /etc/ntp.conf
     regexp: "^server .*$"
-    replace: "server {{ evolinux_system_ntp_server }}"
+    replace: "server {{ evolinux_system_ntpserver }}"
     backup: yes
-  when: evolinux_system_ntp_server
+  when: evolinux_system_set_ntpserver
 
 ## alert5