diff --git a/deployment/puppet/osnailyfacter/modular/ssl/tasks.yaml b/deployment/puppet/osnailyfacter/modular/ssl/tasks.yaml
index f72875ab56..3970cb8b21 100644
--- a/deployment/puppet/osnailyfacter/modular/ssl/tasks.yaml
+++ b/deployment/puppet/osnailyfacter/modular/ssl/tasks.yaml
@@ -40,7 +40,9 @@
 - id: ssl-dns-setup
   type: puppet
   version: 2.1.0
-  groups: [primary-controller, controller]
+  groups: [primary-controller, controller, compute, cinder, primary-mongo, mongo, ceph-osd, virt,
+           primary-rabbitmq, rabbitmq, primary-database, database,
+           primary-keystone, keystone, primary-neutron, neutron]
   requires: [firewall, ssl-add-trust-chain]
   condition:
     yaql_exp: *public_ssl_enabled