diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml
index b7325db..6c88f70 100644
--- a/roles/common/tasks/main.yml
+++ b/roles/common/tasks/main.yml
@@ -8,6 +8,15 @@
 #  lineinfile: dest=/etc/hosts insertafter=^127.0.0.1 line='127.0.1.1       {{ inventory_hostname }}'
 #  tags: hostname
 
+- name: Set timezone
+  when: timezone is defined
+  command: /usr/bin/timedatectl set-timezone {{ timezone }}
+  tags: timezone
+
+- name: Enable NTP
+  command: /usr/bin/timedatectl set-ntp on
+  tags: ntp
+
 - include: packages_Ubuntu.yml
   when: ansible_distribution == 'Ubuntu'
   tags: packages
diff --git a/roles/common/tasks/packages_Ubuntu.yml b/roles/common/tasks/packages_Ubuntu.yml
index c2a3675..ef40454 100644
--- a/roles/common/tasks/packages_Ubuntu.yml
+++ b/roles/common/tasks/packages_Ubuntu.yml
@@ -12,7 +12,6 @@
 - name: Install base packages
   apt: pkg={{ item }}
   with_items:
-    - ntp
     - git
     - tmux
     - iotop