diff --git a/deployment_scripts/puppet/modules/fuel_lma_collector/templates/clusters.yaml.erb b/deployment_scripts/puppet/modules/fuel_lma_collector/templates/clusters.yaml.erb
index efb2931ce..e0b19e229 100644
--- a/deployment_scripts/puppet/modules/fuel_lma_collector/templates/clusters.yaml.erb
+++ b/deployment_scripts/puppet/modules/fuel_lma_collector/templates/clusters.yaml.erb
@@ -698,10 +698,10 @@ lma_collector:
           - nova-novncproxy-websocket # worker
           - controller        # node cluster
         hints:
-          - cinder
+          - cinder-control-plane
           - glance
           - keystone
-          - neutron
+          - neutron-control-plane
           - mysql
           - rabbitmq
       nova-data-plane:
@@ -810,11 +810,11 @@ lma_collector:
           - heat-cloudwatch-api
           - controller
         hints:
-          - cinder
+          - cinder-control-plane
           - glance
           - keystone
-          - neutron
-          - nova
+          - neutron-control-plane
+          - nova-control-plane
           - mysql
           - rabbitmq
       horizon: