diff --git a/roles/core/handlers/main.yml b/roles/core/handlers/main.yml
index 140634e..e184315 100644
--- a/roles/core/handlers/main.yml
+++ b/roles/core/handlers/main.yml
@@ -2,4 +2,4 @@
 
 - import_tasks: remote_access.yml
 - import_tasks: rsyslog.yml
-- import_tasks: ntp.yml
+- import_tasks: time.yml
diff --git a/roles/core/handlers/ntp.yml b/roles/core/handlers/time.yml
similarity index 100%
rename from roles/core/handlers/ntp.yml
rename to roles/core/handlers/time.yml
diff --git a/roles/core/tasks/main.yml b/roles/core/tasks/main.yml
index 54b210d..f5f38e0 100644
--- a/roles/core/tasks/main.yml
+++ b/roles/core/tasks/main.yml
@@ -1,14 +1,10 @@
 ---
 
-- name: Set timezone to America/Toronto
-  timezone:
-    name: America/Toronto
-
 - import_tasks: dns.yml
 - import_tasks: mirrors.yml
+- import_tasks: time.yml
 - import_tasks: remote_access.yml
 - import_tasks: root.yml
-- import_tasks: ntp.yml
   when: not(ansible_virtualization_role == 'guest' and ansible_virtualization_type == 'lxc')
 - import_tasks: logging.yml
 - import_tasks: packages.yml
diff --git a/roles/core/tasks/ntp.yml b/roles/core/tasks/time.yml
similarity index 72%
rename from roles/core/tasks/ntp.yml
rename to roles/core/tasks/time.yml
index 0860cb3..516697a 100644
--- a/roles/core/tasks/ntp.yml
+++ b/roles/core/tasks/time.yml
@@ -1,5 +1,9 @@
 ---
 
+- name: Set timezone to America/Toronto
+  timezone:
+    name: America/Toronto
+
 - name: Install ntp
   apt:
     name: ntp