diff --git a/deployment/puppet/osnailyfacter/modular/dns/tasks.yaml b/deployment/puppet/osnailyfacter/modular/dns/tasks.yaml
index c4827cf3e5..0441a4798c 100644
--- a/deployment/puppet/osnailyfacter/modular/dns/tasks.yaml
+++ b/deployment/puppet/osnailyfacter/modular/dns/tasks.yaml
@@ -10,7 +10,7 @@
 
 - id: dns-client
   type: puppet
-  role: '*'
+  role: [primary-mongo, mongo, primary-controller, controller, compute, ceph-osd, cinder, cinder-vmware, zabbix-server]
   requires: [post_deployment_start]
   required_for: [ntp-client]
   parameters:
diff --git a/deployment/puppet/osnailyfacter/modular/ntp/tasks.yaml b/deployment/puppet/osnailyfacter/modular/ntp/tasks.yaml
index 03e9d86f61..3194618f07 100644
--- a/deployment/puppet/osnailyfacter/modular/ntp/tasks.yaml
+++ b/deployment/puppet/osnailyfacter/modular/ntp/tasks.yaml
@@ -11,7 +11,7 @@
 
 - id: ntp-client
   type: puppet
-  role: '*'
+  role: [primary-mongo, mongo, primary-controller, controller, compute, ceph-osd, cinder, cinder-vmware, zabbix-server]
   requires: [dns-client]
   required_for: [post_deployment_end]
   parameters: