diff --git a/roles/ntp-server/handlers/main.yml b/roles/ntp-server/handlers/main.yml
index 71e4149..d879ff1 100644
--- a/roles/ntp-server/handlers/main.yml
+++ b/roles/ntp-server/handlers/main.yml
@@ -1,3 +1,5 @@
 ---
 - name: restart ntpd
-  service: name=ntp state=restarted
+  service:
+    name: ntp
+    state: restarted
diff --git a/roles/ntp-server/tasks/main.yml b/roles/ntp-server/tasks/main.yml
index 5c7d001..9b3c42d 100644
--- a/roles/ntp-server/tasks/main.yml
+++ b/roles/ntp-server/tasks/main.yml
@@ -1,14 +1,21 @@
 ---
-- name: be sure ntp is installed
-  apt: name=ntp state=latest
+- name: install ntpd
+  apt:
+    name: ntp
+    state: present
   tags: ntp
 
-- name: be sure ntp is configured
-  template: src=ntp.conf.j2 dest=/etc/ntp.conf
-  notify:
-    - restart ntpd
+- name: template ntp.conf
+  template:
+    src: ntp.conf.j2
+    dest: /etc/ntp.conf
+    backup: yes
+  notify: restart ntpd
   tags: ntp
 
-- name: be sure ntpd is running and enabled
-  service: name=ntp state=started enabled=yes
+- name: start and enable ntpd
+  service:
+    name: ntp
+    state: started
+    enabled: yes
   tags: ntp