diff --git a/deployment/puppet/osnailyfacter/modular/astute/tasks.yaml b/deployment/puppet/osnailyfacter/modular/astute/tasks.yaml
index f9a435d8b5..f3c1eb0d37 100644
--- a/deployment/puppet/osnailyfacter/modular/astute/tasks.yaml
+++ b/deployment/puppet/osnailyfacter/modular/astute/tasks.yaml
@@ -55,17 +55,6 @@
     timeout: 3600
     cwd: /
 
-- id: ntp-client
-  type: puppet
-  role: '*'
-  requires: [post_deployment_start]
-  required_for: [post_deployment_end]
-  parameters:
-    puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/ntp/ntp-client.pp
-    puppet_modules: /etc/puppet/modules
-    timeout: 3600
-    cwd: /
-
 - id: vcenter_compute_zones_create
   type: shell
   role: [primary-controller]
diff --git a/deployment/puppet/osnailyfacter/modular/dns/dns-client.pp b/deployment/puppet/osnailyfacter/modular/dns/dns-client.pp
index 050fdf289c..f7207b373a 100644
--- a/deployment/puppet/osnailyfacter/modular/dns/dns-client.pp
+++ b/deployment/puppet/osnailyfacter/modular/dns/dns-client.pp
@@ -1,6 +1,6 @@
 notice('MODULAR: dns-client.pp')
 
-$management_vip     = hiera('management_vrouter_vip')
+$management_vip = hiera('management_vrouter_vip')
 
 class { 'osnailyfacter::resolvconf':
   management_vip => $management_vip,
diff --git a/deployment/puppet/osnailyfacter/modular/dns/tasks.yaml b/deployment/puppet/osnailyfacter/modular/dns/tasks.yaml
index ca1b0bb856..c4827cf3e5 100644
--- a/deployment/puppet/osnailyfacter/modular/dns/tasks.yaml
+++ b/deployment/puppet/osnailyfacter/modular/dns/tasks.yaml
@@ -1,7 +1,7 @@
 - id: dns-server
   type: puppet
   groups: [primary-controller, controller]
-  required_for: [dns-client]
+  required_for: [deploy_end]
   requires: [openstack-haproxy]
   parameters:
     puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/dns/dns-server.pp
@@ -10,10 +10,11 @@
 
 - id: dns-client
   type: puppet
-  groups: [primary-controller, controller, cinder, cinder-vmware, compute, ceph-osd, zabbix-server, primary-mongo, mongo]
-  required_for: [deploy_end]
-  requires: [netconfig]
+  role: '*'
+  requires: [post_deployment_start]
+  required_for: [ntp-client]
   parameters:
     puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/dns/dns-client.pp
     puppet_modules: /etc/puppet/modules
     timeout: 3600
+    cwd: /
diff --git a/deployment/puppet/osnailyfacter/modular/ntp/tasks.yaml b/deployment/puppet/osnailyfacter/modular/ntp/tasks.yaml
index 792391f202..1922327082 100644
--- a/deployment/puppet/osnailyfacter/modular/ntp/tasks.yaml
+++ b/deployment/puppet/osnailyfacter/modular/ntp/tasks.yaml
@@ -1,9 +1,21 @@
 - id: ntp-server
   type: puppet
-  groups: [primary-controller, controller]
-  required_for: [deploy_end]
+  role: [primary-controller, controller]
+  required_for: [ntp-client]
   requires: [dns-client]
   parameters:
     puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/ntp/ntp-server.pp
     puppet_modules: /etc/puppet/modules
     timeout: 3600
+    cwd: /
+
+- id: ntp-client
+  type: puppet
+  role: '*'
+  requires: [dns-client]
+  required_for: [post_deployment_end]
+  parameters:
+    puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/ntp/ntp-client.pp
+    puppet_modules: /etc/puppet/modules
+    timeout: 3600
+    cwd: /