diff --git a/library/roles/ubuntu-deb-general/meta/main.yml b/library/roles/ubuntu-deb-general/meta/main.yml
index 8bde6019..ad35f92d 100644
--- a/library/roles/ubuntu-deb-general/meta/main.yml
+++ b/library/roles/ubuntu-deb-general/meta/main.yml
@@ -6,6 +6,7 @@ dependencies:
   - role: '../../library/roles/deb-set-locale'
   - role: '../../library/roles/timezone'
   - role: '../../library/roles/motd'
+  - role: '../../library/roles/ntp'
   - role: '../../library/roles/linux-kernel-sysctl'
   - role: '../../library/roles/sshd_config'
   - role: '../../library/roles/fail2ban'
diff --git a/library/roles/ubuntu-deb-general/tasks/main.yml b/library/roles/ubuntu-deb-general/tasks/main.yml
index cb5723da..2e2419cb 100644
--- a/library/roles/ubuntu-deb-general/tasks/main.yml
+++ b/library/roles/ubuntu-deb-general/tasks/main.yml
@@ -7,7 +7,6 @@
 - import_tasks: packages.yml
 - import_tasks: install_nscd.yml
   when: install_nscd
-- import_tasks: ntp.yml
 - import_tasks: remove-unneeded-pkgs.yml
 - import_tasks: denyhost.yml
   when: is_debian_7_or_older
diff --git a/library/roles/ubuntu-deb-general/tasks/ntp.yml b/library/roles/ubuntu-deb-general/tasks/ntp.yml
deleted file mode 100644
index 49217479..00000000
--- a/library/roles/ubuntu-deb-general/tasks/ntp.yml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-- name: Install the ntp server
-  apt: pkg=ntp state={{ pkg_state }}
-  tags: [ 'packages', 'ntp' ]
-
-- name: Install the ntp configuration. Needed on Ubuntu Xenial to allow the nagios check
-  template: src=ntp.conf.j2 dest=/etc/ntp.conf owner=root group=root mode=0644
-  notify: Restart ntp server
-  tags: [ 'packages', 'ntp' ]
-  
-- name: Ensure that the ntp server is running
-  service: name=ntp state=started enabled=yes
-  tags: [ 'packages', 'ntp' ]
-
diff --git a/library/roles/ubuntu-deb-general/templates/ntp.conf.j2 b/library/roles/ubuntu-deb-general/templates/ntp.conf.j2
deleted file mode 100644
index b4670dd6..00000000
--- a/library/roles/ubuntu-deb-general/templates/ntp.conf.j2
+++ /dev/null
@@ -1,69 +0,0 @@
-# /etc/ntp.conf, configuration for ntpd; see ntp.conf(5) for help
-
-driftfile /var/lib/ntp/ntp.drift
-
-# Enable this if you want statistics to be logged.
-#statsdir /var/log/ntpstats/
-
-statistics loopstats peerstats clockstats
-filegen loopstats file loopstats type day enable
-filegen peerstats file peerstats type day enable
-filegen clockstats file clockstats type day enable
-
-# Specify one or more NTP servers.
-
-# Use servers from the NTP Pool Project. Approved by Ubuntu Technical Board
-# on 2011-02-08 (LP: #104525). See http://www.pool.ntp.org/join.html for
-# more information.
-pool 0.ubuntu.pool.ntp.org iburst
-pool 1.ubuntu.pool.ntp.org iburst
-pool 2.ubuntu.pool.ntp.org iburst
-pool 3.ubuntu.pool.ntp.org iburst
-
-# Use Ubuntu's ntp server as a fallback.
-pool ntp.ubuntu.com
-
-# Access control configuration; see /usr/share/doc/ntp-doc/html/accopt.html for
-# details.  The web page <http://support.ntp.org/bin/view/Support/AccessRestrictions>
-# might also be helpful.
-#
-# Note that "restrict" applies to both servers and clients, so a configuration
-# that might be intended to block requests from certain clients could also end
-# up blocking replies from your own upstream servers.
-
-# By default, exchange time with everybody, but don't allow configuration.
-restrict -4 default kod notrap nomodify nopeer noquery limited
-restrict -6 default kod notrap nomodify nopeer noquery limited
-
-# Local users may interrogate the ntp server more closely.
-restrict 127.0.0.1
-restrict ::1
-
-# Needed for adding pool entries
-restrict source notrap nomodify noquery
-
-# Clients from this (example!) subnet have unlimited access, but only if
-# cryptographically authenticated.
-{% if nagios_monitoring_server_ip is defined %}
-{% for ip in nagios_monitoring_server_ip %}
-restrict {{ ip }} mask 255.255.255.255
-{% endfor %}
-{% endif %}
-
-# If you want to provide time to your local subnet, change the next line.
-# (Again, the address is an example only.)
-#broadcast 192.168.123.255
-
-# If you want to listen to time broadcasts on your local subnet, de-comment the
-# next lines.  Please do this only if you trust everybody on the network!
-#disable auth
-#broadcastclient
-
-#Changes recquired to use pps synchonisation as explained in documentation:
-#http://www.ntp.org/ntpfaq/NTP-s-config-adv.htm#AEN3918
-
-#server 127.127.8.1 mode 135 prefer    # Meinberg GPS167 with PPS
-#fudge 127.127.8.1 time1 0.0042        # relative to PPS for my hardware
-
-#server 127.127.22.1                   # ATOM(PPS)
-#fudge 127.127.22.1 flag3 1            # enable PPS API