diff --git a/templates/510_init-daemons-ngcp.yaml.tt2 b/templates/510_init-daemons-ngcp.yaml.tt2
index c7dbff6..2a12dea 100644
--- a/templates/510_init-daemons-ngcp.yaml.tt2
+++ b/templates/510_init-daemons-ngcp.yaml.tt2
@@ -7,7 +7,7 @@
   is_db = ngcp.has_role(hostname, 'db');
   is_rtp = ngcp.has_role(hostname, 'rtp');
   is_li = ngcp.has_role(hostname, 'li');
-  is_li_dist = is_li && cluster_sets.type == 'distributed' && intercept.enable == 'yes';
+  is_li_dist = ngcp.has_role(hostname, 'li_dist');
 -%]
 [% PERL -%]
     my $node_state = qx(ngcp-check-active -v);
diff --git a/templates/900_service-ngcp-api.yaml.tt2 b/templates/900_service-ngcp-api.yaml.tt2
index 7856004..0a22ecb 100644
--- a/templates/900_service-ngcp-api.yaml.tt2
+++ b/templates/900_service-ngcp-api.yaml.tt2
@@ -35,7 +35,7 @@
 
   is_mgmt = ngcp.has_role(hostname, 'mgmt');
   is_li = ngcp.has_role(hostname, 'li');
-  is_li_dist = is_li && cluster_sets.type == 'distributed' && intercept.enable == 'yes';
+  is_li_dist = ngcp.has_role(hostname, 'li_dist');
 -%]
 [% PERL -%]
     my $node_state = qx(ngcp-check-active -v);
diff --git a/templates/911_service-grafana.yaml.tt2 b/templates/911_service-grafana.yaml.tt2
index 4a8ced4..e9d15c8 100644
--- a/templates/911_service-grafana.yaml.tt2
+++ b/templates/911_service-grafana.yaml.tt2
@@ -2,7 +2,7 @@
   hostname = ngcp.get_hostname();
 
   is_mgmt = ngcp.has_role(hostname, 'mgmt');
-  is_li_dist = is_li && cluster_sets.type == 'distributed' && intercept.enable == 'yes';
+  is_li_dist = ngcp.has_role(hostname, 'li_dist');
 -%]
 
 file: