diff --git a/config/core/defaults.yml b/config/core/defaults.yml
index d2e595421..7def69386 100644
--- a/config/core/defaults.yml
+++ b/config/core/defaults.yml
@@ -75,6 +75,8 @@ m_timezone: "America/Chicago"
 
 meza_server_log_db: meza_server_log
 
+use_ntp: true
+
 ntp_server: [0.pool.ntp.org, 1.pool.ntp.org, 2.pool.ntp.org, 3.pool.ntp.org]
 
 m_language: en
diff --git a/src/roles/base/tasks/main.yml b/src/roles/base/tasks/main.yml
index 1c7852fa4..e65af1607 100644
--- a/src/roles/base/tasks/main.yml
+++ b/src/roles/base/tasks/main.yml
@@ -212,18 +212,20 @@
     state: installed
   tags:
   - latest
+  when: use_ntp
 
 - name: Ensure NTP is running and enabled as configured.
   service:
     name: ntpd
     state: started
     enabled: yes
-  when: docker_skip_tasks is not defined or not docker_skip_tasks
+  when: use_ntp
 
 - name: Copy the ntp.conf template file
   template: src=ntp.conf.j2 dest=/etc/ntp.conf
   notify:
     - restart ntpd
+  when: use_ntp
 
 # FIXME #809: PIP required first; has dependencies; needed on all hosts?
 # Speed up encrypt/decrypt operations