diff --git a/deployment_scripts/puppet/manifests/base.pp b/deployment_scripts/puppet/manifests/base.pp
index b23efa4b0..4503f32be 100644
--- a/deployment_scripts/puppet/manifests/base.pp
+++ b/deployment_scripts/puppet/manifests/base.pp
@@ -24,10 +24,10 @@ $current_roles     = hiera('roles')
 $network_metadata  = hiera_hash('network_metadata')
 
 $elasticsearch_kibana = hiera_hash('elasticsearch_kibana', {})
-$es_nodes = filter_nodes(hiera('nodes'), 'role', 'elasticsearch_kibana')
+$es_nodes = get_nodes_hash_by_roles($network_metadata, ['elasticsearch_kibana'])
 
 $influxdb_grafana = hiera_hash('influxdb_grafana', {})
-$influxdb_nodes = filter_nodes(hiera('nodes'), 'role', 'influxdb_grafana')
+$influxdb_nodes = get_nodes_hash_by_roles($network_metadata, ['influxdb_grafana'])
 
 if $lma_collector['environment_label'] != '' {
   $environment_label = $lma_collector['environment_label']
diff --git a/deployment_scripts/puppet/manifests/configure_afd_filters.pp b/deployment_scripts/puppet/manifests/configure_afd_filters.pp
index a1ce7143f..47e4b469b 100644
--- a/deployment_scripts/puppet/manifests/configure_afd_filters.pp
+++ b/deployment_scripts/puppet/manifests/configure_afd_filters.pp
@@ -58,7 +58,7 @@ if $alerting_mode == 'remote' {
       $nagios_server = $network_metadata['vips']['infrastructure_alerting_mgmt_vip']['ipaddr']
     } else {
       # compatibility with the LMA Infrastructure Alerting plugin 0.8
-      $nagios_nodes = filter_nodes(hiera('nodes'), 'role', 'infrastructure_alerting')
+      $nagios_nodes = get_nodes_hash_by_roles($network_metadata, ['infrastructure_alerting'])
       $nagios_server = $nagios_nodes[0]['internal_address']
     }
     $nagios_user = $lma_infra_alerting['nagios_user']
diff --git a/deployment_scripts/puppet/manifests/controller.pp b/deployment_scripts/puppet/manifests/controller.pp
index 0b60b7783..f055c08f8 100644
--- a/deployment_scripts/puppet/manifests/controller.pp
+++ b/deployment_scripts/puppet/manifests/controller.pp
@@ -432,7 +432,7 @@ if $influxdb_mode != 'disabled' {
     } else {
       # compatibility with the InfluxDB-Grafana plugin 0.8
       $influxdb_grafana = hiera_hash('influxdb_grafana', {})
-      $influxdb_nodes = filter_nodes(hiera('nodes'), 'role', 'influxdb_grafana')
+      $influxdb_nodes = get_nodes_hash_by_roles($network_metadata, ['influxdb_grafana'])
       $influxdb_server = $influxdb_nodes[0]['internal_address']
     }
   } else {
@@ -476,7 +476,7 @@ if $alerting_mode == 'remote' {
       $nagios_server = $network_metadata['vips']['infrastructure_alerting_mgmt_vip']['ipaddr']
     } else {
       # compatibility with the LMA Infrastructure Alerting plugin 0.8
-      $nagios_nodes = filter_nodes(hiera('nodes'), 'role', 'infrastructure_alerting')
+      $nagios_nodes = get_nodes_hash_by_roles($network_metadata, ['infrastructure_alerting'])
       $nagios_server = $nagios_nodes[0]['internal_address']
     }
     $nagios_user = $lma_infra_alerting['nagios_user']