diff --git a/controls/roles/manage-service/templates/prometheus.yml.j2 b/controls/roles/manage-service/templates/prometheus.yml.j2
index 68f9cf883..d70c37b8f 100644
--- a/controls/roles/manage-service/templates/prometheus.yml.j2
+++ b/controls/roles/manage-service/templates/prometheus.yml.j2
@@ -8,13 +8,15 @@ scrape_configs:
   - job_name: besu
     static_configs:
       - targets: [
-{% set config_count = 0 %}
-{% for service_config in service_configs.results %}
-{%   if (service_config.content | b64decode | from_yaml).service == "BesuService" %}
-          {% if (config_count > 0) %},{% endif %}"stereum-{{ (service_config.content | b64decode | from_yaml).id }}:9545"
-          {% set config_count = config_count + 1 %}
-{%   endif %}
+{% set targets = [] %}
+{%- for service_config in service_configs.results %}
+  {%- if (service_config.content | b64decode | from_yaml).service == "BesuService" %}
+    {%- set _ = targets.append("stereum-" ~ (service_config.content | b64decode | from_yaml).id ~ ":9545") %}
+  {%- endif %}
 {% endfor %}
+{% if targets %}
+          "{{ targets | join('",\n          "') }}"
+{% endif %}
         ]
 
 # ssv.network
@@ -22,25 +24,29 @@ scrape_configs:
     metrics_path: /metrics
     static_configs:
       - targets: [
-{% set config_count = 0 %}
-{% for service_config in service_configs.results %}
-{%   if (service_config.content | b64decode | from_yaml).service == "SSVNetworkService" %}
-          {% if (config_count > 0) %},{% endif %}"stereum-{{ (service_config.content | b64decode | from_yaml).id }}:15000"
-          {% set config_count = config_count + 1 %}
-{%   endif %}
+{% set targets = [] %}
+{%- for service_config in service_configs.results %}
+  {%- if (service_config.content | b64decode | from_yaml).service == "SSVNetworkService" %}
+    {%- set _ = targets.append("stereum-" ~ (service_config.content | b64decode | from_yaml).id ~ ":15000") %}
+  {%- endif %}
 {% endfor %}
+{% if targets %}
+          "{{ targets | join('",\n          "') }}"
+{% endif %}
         ]
   - job_name: ssv_health
     metrics_path: /health
     static_configs:
       - targets: [
-{% set config_count = 0 %}
-{% for service_config in service_configs.results %}
-{%   if (service_config.content | b64decode | from_yaml).service == "SSVNetworkService" %}
-          {% if (config_count > 0) %},{% endif %}"stereum-{{ (service_config.content | b64decode | from_yaml).id }}:15000"
-          {% set config_count = config_count + 1 %}
-{%   endif %}
+{% set targets = [] %}
+{%- for service_config in service_configs.results %}
+  {%- if (service_config.content | b64decode | from_yaml).service == "SSVNetworkService" %}
+    {%- set _ = targets.append("stereum-" ~ (service_config.content | b64decode | from_yaml).id ~ ":15000") %}
+  {%- endif %}
 {% endfor %}
+{% if targets %}
+          "{{ targets | join('",\n          "') }}"
+{% endif %}
         ]
 
 # geth
@@ -48,106 +54,122 @@ scrape_configs:
     metrics_path: /debug/metrics/prometheus
     static_configs:
       - targets: [
-{% set config_count = 0 %}
-{% for service_config in service_configs.results %}
-{%   if (service_config.content | b64decode | from_yaml).service == "GethService" %}
-          {% if (config_count > 0) %},{% endif %}"stereum-{{ (service_config.content | b64decode | from_yaml).id }}:6060"
-          {% set config_count = config_count + 1 %}
-{%   endif %}
+{% set targets = [] %}
+{%- for service_config in service_configs.results %}
+  {%- if (service_config.content | b64decode | from_yaml).service == "GethService" %}
+    {%- set _ = targets.append("stereum-" ~ (service_config.content | b64decode | from_yaml).id ~ ":6060") %}
+  {%- endif %}
 {% endfor %}
+{% if targets %}
+          "{{ targets | join('",\n          "') }}"
+{% endif %}
         ]
 
 # reth
   - job_name: reth
     static_configs:
       - targets: [
-{% set config_count = 0 %}
-{% for service_config in service_configs.results %}
-{%   if (service_config.content | b64decode | from_yaml).service == "RethService" %}
-          {% if (config_count > 0) %},{% endif %}"stereum-{{ (service_config.content | b64decode | from_yaml).id }}:6060"
-          {% set config_count = config_count + 1 %}
-{%   endif %}
+{% set targets = [] %}
+{%- for service_config in service_configs.results %}
+  {%- if (service_config.content | b64decode | from_yaml).service == "RethService" %}
+    {%- set _ = targets.append("stereum-" ~ (service_config.content | b64decode | from_yaml).id ~ ":6060") %}
+  {%- endif %}
 {% endfor %}
+{% if targets %}
+          "{{ targets | join('",\n          "') }}"
+{% endif %}
         ]
 
 # lighthouse beacon
   - job_name: lighthouse_beacon
     static_configs:
       - targets: [
-{% set config_count = 0 %}
-{% for service_config in service_configs.results %}
-{%   if (service_config.content | b64decode | from_yaml).service == "LighthouseBeaconService" %}
-          {% if (config_count > 0) %},{% endif %}"stereum-{{ (service_config.content | b64decode | from_yaml).id }}:5054"
-          {% set config_count = config_count + 1 %}
-{%   endif %}
+{% set targets = [] %}
+{%- for service_config in service_configs.results %}
+  {%- if (service_config.content | b64decode | from_yaml).service == "LighthouseBeaconService" %}
+    {%- set _ = targets.append("stereum-" ~ (service_config.content | b64decode | from_yaml).id ~ ":5054") %}
+  {%- endif %}
 {% endfor %}
+{% if targets %}
+          "{{ targets | join('",\n          "') }}"
+{% endif %}
         ]
 
 # lighthouse validator
   - job_name: lighthouse_validator
     static_configs:
       - targets: [
-{% set config_count = 0 %}
-{% for service_config in service_configs.results %}
-{%   if (service_config.content | b64decode | from_yaml).service == "LighthouseValidatorService" %}
-          {% if (config_count > 0) %},{% endif %}"stereum-{{ (service_config.content | b64decode | from_yaml).id }}:5064"
-          {% set config_count = config_count + 1 %}
-{%   endif %}
+{% set targets = [] %}
+{%- for service_config in service_configs.results %}
+  {%- if (service_config.content | b64decode | from_yaml).service == "LighthouseValidatorService" %}
+    {%- set _ = targets.append("stereum-" ~ (service_config.content | b64decode | from_yaml).id ~ ":5064") %}
+  {%- endif %}
 {% endfor %}
+{% if targets %}
+          "{{ targets | join('",\n          "') }}"
+{% endif %}
         ]
 
 # nethermind
   - job_name: nethermind
     static_configs:
       - targets: [
-{% set config_count = 0 %}
-{% for service_config in service_configs.results %}
-{%   if (service_config.content | b64decode | from_yaml).service == "NethermindService" %}
-          {% if (config_count > 0) %},{% endif %}"stereum-{{ (service_config.content | b64decode | from_yaml).id }}:6060"
-          {% set config_count = config_count + 1 %}
-{%   endif %}
+{% set targets = [] %}
+{%- for service_config in service_configs.results %}
+  {%- if (service_config.content | b64decode | from_yaml).service == "NethermindService" %}
+    {%- set _ = targets.append("stereum-" ~ (service_config.content | b64decode | from_yaml).id ~ ":6060") %}
+  {%- endif %}
 {% endfor %}
+{% if targets %}
+          "{{ targets | join('",\n          "') }}"
+{% endif %}
         ]
 
-# nimbus consensus client
+# nimbus beacon
   - job_name: nimbus_beacon
     metrics_path: /metrics
     static_configs:
       - targets: [
-{% set config_count = 0 %}
-{% for service_config in service_configs.results %}
-{%   if (service_config.content | b64decode | from_yaml).service == "NimbusBeaconService" %}
-          {% if (config_count > 0) %},{% endif %}"stereum-{{ (service_config.content | b64decode | from_yaml).id }}:8008"
-          {% set config_count = config_count + 1 %}
-{%   endif %}
+{% set targets = [] %}
+{%- for service_config in service_configs.results %}
+  {%- if (service_config.content | b64decode | from_yaml).service == "NimbusBeaconService" %}
+    {%- set _ = targets.append("stereum-" ~ (service_config.content | b64decode | from_yaml).id ~ ":8008") %}
+  {%- endif %}
 {% endfor %}
+{% if targets %}
+          "{{ targets | join('",\n          "') }}"
+{% endif %}
         ]
 
-# nimbus validator client
+# nimbus validator
   - job_name: nimbus_validator
     metrics_path: /metrics
     static_configs:
       - targets: [
-{% set config_count = 0 %}
-{% for service_config in service_configs.results %}
-{%   if (service_config.content | b64decode | from_yaml).service == "NimbusValidatorService" %}
-          {% if (config_count > 0) %},{% endif %}"stereum-{{ (service_config.content | b64decode | from_yaml).id }}:8108"
-          {% set config_count = config_count + 1 %}
-{%   endif %}
+{% set targets = [] %}
+{%- for service_config in service_configs.results %}
+  {%- if (service_config.content | b64decode | from_yaml).service == "NimbusValidatorService" %}
+    {%- set _ = targets.append("stereum-" ~ (service_config.content | b64decode | from_yaml).id ~ ":8108") %}
+  {%- endif %}
 {% endfor %}
+{% if targets %}
+          "{{ targets | join('",\n          "') }}"
+{% endif %}
         ]
 
 # prometheus node exporter
   - job_name: prometheus_node_exporter
     static_configs:
       - targets: [
-{% set config_count = 0 %}
-{% for service_config in service_configs.results %}
-{%   if (service_config.content | b64decode | from_yaml).service == "PrometheusNodeExporterService" %}
-          {% if (config_count > 0) %},{% endif %}"stereum-{{ (service_config.content | b64decode | from_yaml).id }}:9100"
-          {% set config_count = config_count + 1 %}
-{%   endif %}
+{% set targets = [] %}
+{%- for service_config in service_configs.results %}
+  {%- if (service_config.content | b64decode | from_yaml).service == "PrometheusNodeExporterService" %}
+    {%- set _ = targets.append("stereum-" ~ (service_config.content | b64decode | from_yaml).id ~ ":9100") %}
+  {%- endif %}
 {% endfor %}
+{% if targets %}
+          "{{ targets | join('",\n          "') }}"
+{% endif %}
         ]
 
 # prometheus
@@ -159,26 +181,30 @@ scrape_configs:
   - job_name: prysm_beacon
     static_configs:
       - targets: [
-{% set config_count = 0 %}
-{% for service_config in service_configs.results %}
-{%   if (service_config.content | b64decode | from_yaml).service == "PrysmBeaconService" %}
-          {% if (config_count > 0) %},{% endif %}"stereum-{{ (service_config.content | b64decode | from_yaml).id }}:8080"
-          {% set config_count = config_count + 1 %}
-{%   endif %}
+{% set targets = [] %}
+{%- for service_config in service_configs.results %}
+  {%- if (service_config.content | b64decode | from_yaml).service == "PrysmBeaconService" %}
+    {%- set _ = targets.append("stereum-" ~ (service_config.content | b64decode | from_yaml).id ~ ":8080") %}
+  {%- endif %}
 {% endfor %}
+{% if targets %}
+          "{{ targets | join('",\n          "') }}"
+{% endif %}
         ]
 
 # prysm validator
   - job_name: prysm_validator
     static_configs:
       - targets: [
-{% set config_count = 0 %}
-{% for service_config in service_configs.results %}
-{%   if (service_config.content | b64decode | from_yaml).service == "PrysmValidatorService" %}
-          {% if (config_count > 0) %},{% endif %}"stereum-{{ (service_config.content | b64decode | from_yaml).id }}:8081"
-          {% set config_count = config_count + 1 %}
-{%   endif %}
+{% set targets = [] %}
+{%- for service_config in service_configs.results %}
+  {%- if (service_config.content | b64decode | from_yaml).service == "PrysmValidatorService" %}
+    {%- set _ = targets.append("stereum-" ~ (service_config.content | b64decode | from_yaml).id ~ ":8081") %}
+  {%- endif %}
 {% endfor %}
+{% if targets %}
+          "{{ targets | join('",\n          "') }}"
+{% endif %}
         ]
 
 # teku beacon
@@ -187,13 +213,15 @@ scrape_configs:
     scheme: http
     static_configs:
       - targets: [
-{% set config_count = 0 %}
-{% for service_config in service_configs.results %}
-{%   if (service_config.content | b64decode | from_yaml).service == "TekuBeaconService" %}
-          {% if (config_count > 0) %},{% endif %}"stereum-{{ (service_config.content | b64decode | from_yaml).id }}:8008"
-          {% set config_count = config_count + 1 %}
-{%   endif %}
+{% set targets = [] %}
+{%- for service_config in service_configs.results %}
+  {%- if (service_config.content | b64decode | from_yaml).service == "TekuBeaconService" %}
+    {%- set _ = targets.append("stereum-" ~ (service_config.content | b64decode | from_yaml).id ~ ":8008") %}
+  {%- endif %}
 {% endfor %}
+{% if targets %}
+          "{{ targets | join('",\n          "') }}"
+{% endif %}
         ]
 
 # teku validator
@@ -202,13 +230,15 @@ scrape_configs:
     scheme: http
     static_configs:
       - targets: [
-{% set config_count = 0 %}
-{% for service_config in service_configs.results %}
-{%   if (service_config.content | b64decode | from_yaml).service == "TekuValidatorService" %}
-          {% if (config_count > 0) %},{% endif %}"stereum-{{ (service_config.content | b64decode | from_yaml).id }}:8008"
-          {% set config_count = config_count + 1 %}
-{%   endif %}
+{% set targets = [] %}
+{%- for service_config in service_configs.results %}
+  {%- if (service_config.content | b64decode | from_yaml).service == "TekuValidatorService" %}
+    {%- set _ = targets.append("stereum-" ~ (service_config.content | b64decode | from_yaml).id ~ ":8008") %}
+  {%- endif %}
 {% endfor %}
+{% if targets %}
+          "{{ targets | join('",\n          "') }}"
+{% endif %}
         ]
 
 # lodestar beacon
@@ -216,13 +246,15 @@ scrape_configs:
     metrics_path: /metrics
     static_configs:
       - targets: [
-{% set config_count = 0 %}
-{% for service_config in service_configs.results %}
-{%   if (service_config.content | b64decode | from_yaml).service == "LodestarBeaconService" %}
-          {% if (config_count > 0) %},{% endif %}"stereum-{{ (service_config.content | b64decode | from_yaml).id }}:8008"
-          {% set config_count = config_count + 1 %}
-{%   endif %}
+{% set targets = [] %}
+{%- for service_config in service_configs.results %}
+  {%- if (service_config.content | b64decode | from_yaml).service == "LodestarBeaconService" %}
+    {%- set _ = targets.append("stereum-" ~ (service_config.content | b64decode | from_yaml).id ~ ":8008") %}
+  {%- endif %}
 {% endfor %}
+{% if targets %}
+          "{{ targets | join('",\n          "') }}"
+{% endif %}
         ]
 
 # lodestar validator
@@ -230,13 +262,15 @@ scrape_configs:
     metrics_path: /metrics
     static_configs:
       - targets: [
-{% set config_count = 0 %}
-{% for service_config in service_configs.results %}
-{%   if (service_config.content | b64decode | from_yaml).service == "LodestarValidatorService" %}
-          {% if (config_count > 0) %},{% endif %}"stereum-{{ (service_config.content | b64decode | from_yaml).id }}:5064"
-          {% set config_count = config_count + 1 %}
-{%   endif %}
+{% set targets = [] %}
+{%- for service_config in service_configs.results %}
+  {%- if (service_config.content | b64decode | from_yaml).service == "LodestarValidatorService" %}
+    {%- set _ = targets.append("stereum-" ~ (service_config.content | b64decode | from_yaml).id ~ ":5064") %}
+  {%- endif %}
 {% endfor %}
+{% if targets %}
+          "{{ targets | join('",\n          "') }}"
+{% endif %}
         ]
 
 # erigon
@@ -244,13 +278,15 @@ scrape_configs:
     metrics_path: /debug/metrics/prometheus
     static_configs:
       - targets: [
-{% set config_count = 0 %}
-{% for service_config in service_configs.results %}
-{%   if (service_config.content | b64decode | from_yaml).service == "ErigonService" %}
-          {% if (config_count > 0) %},{% endif %}"stereum-{{ (service_config.content | b64decode | from_yaml).id }}:6060"
-          {% set config_count = config_count + 1 %}
-{%   endif %}
+{% set targets = [] %}
+{%- for service_config in service_configs.results %}
+  {%- if (service_config.content | b64decode | from_yaml).service == "ErigonService" %}
+    {%- set _ = targets.append("stereum-" ~ (service_config.content | b64decode | from_yaml).id ~ ":6060") %}
+  {%- endif %}
 {% endfor %}
+{% if targets %}
+          "{{ targets | join('",\n          "') }}"
+{% endif %}
         ]
 
 # Web3Signer
@@ -258,13 +294,15 @@ scrape_configs:
     metrics_path: /metrics
     static_configs:
       - targets: [
-{% set config_count = 0 %}
-{% for service_config in service_configs.results %}
-{%   if (service_config.content | b64decode | from_yaml).service == "Web3SignerService" %}
-          {% if (config_count > 0) %},{% endif %}"stereum-{{ (service_config.content | b64decode | from_yaml).id }}:9001"
-          {% set config_count = config_count + 1 %}
-{%   endif %}
+{% set targets = [] %}
+{%- for service_config in service_configs.results %}
+  {%- if (service_config.content | b64decode | from_yaml).service == "Web3SignerService" %}
+    {%- set _ = targets.append("stereum-" ~ (service_config.content | b64decode | from_yaml).id ~ ":9001") %}
+  {%- endif %}
 {% endfor %}
+{% if targets %}
+          "{{ targets | join('",\n          "') }}"
+{% endif %}
         ]
 
 # ValidatorEjectorService
@@ -272,39 +310,45 @@ scrape_configs:
     metrics_path: /metrics
     static_configs:
       - targets: [
-{% set config_count = 0 %}
-{% for service_config in service_configs.results %}
-{%   if (service_config.content | b64decode | from_yaml).service == "ValidatorEjectorService" %}
-          {% if (config_count > 0) %},{% endif %}"stereum-{{ (service_config.content | b64decode | from_yaml).id }}:8989"
-          {% set config_count = config_count + 1 %}
-{%   endif %}
+{% set targets = [] %}
+{%- for service_config in service_configs.results %}
+  {%- if (service_config.content | b64decode | from_yaml).service == "ValidatorEjectorService" %}
+    {%- set _ = targets.append("stereum-" ~ (service_config.content | b64decode | from_yaml).id ~ ":8989") %}
+  {%- endif %}
 {% endfor %}
+{% if targets %}
+          "{{ targets | join('",\n          "') }}"
+{% endif %}
         ]
 
 # KeysAPI
   - job_name: keys-api
     static_configs:
       - targets: [
-{% set config_count = 0 %}
-{% for service_config in service_configs.results %}
-{%   if (service_config.content | b64decode | from_yaml).service == "KeysAPIService" %}
-          {% if (config_count > 0) %},{% endif %}"stereum-{{ (service_config.content | b64decode | from_yaml).id }}:3600"
-          {% set config_count = config_count + 1 %}
-{%   endif %}
+{% set targets = [] %}
+{%- for service_config in service_configs.results %}
+  {%- if (service_config.content | b64decode | from_yaml).service == "KeysAPIService" %}
+    {%- set _ = targets.append("stereum-" ~ (service_config.content | b64decode | from_yaml).id ~ ":3600") %}
+  {%- endif %}
 {% endfor %}
+{% if targets %}
+          "{{ targets | join('",\n          "') }}"
+{% endif %}
         ]
 
 # Charon
   - job_name: charon
     static_configs:
       - targets: [
-{% set config_count = 0 %}
-{% for service_config in service_configs.results %}
-{%   if (service_config.content | b64decode | from_yaml).service == "CharonService" %}
-          {% if (config_count > 0) %},{% endif %}"stereum-{{ (service_config.content | b64decode | from_yaml).id }}:3620"
-          {% set config_count = config_count + 1 %}
-{%   endif %}
+{% set targets = [] %}
+{%- for service_config in service_configs.results %}
+  {%- if (service_config.content | b64decode | from_yaml).service == "CharonService" %}
+    {%- set _ = targets.append("stereum-" ~ (service_config.content | b64decode | from_yaml).id ~ ":3620") %}
+  {%- endif %}
 {% endfor %}
+{% if targets %}
+          "{{ targets | join('",\n          "') }}"
+{% endif %}
         ]
 
 # LCOMService
@@ -313,27 +357,31 @@ scrape_configs:
     metrics_path: /metrics/fast
     static_configs:
       - targets: [
-{% set config_count = 0 %}
-{% for service_config in service_configs.results %}
-{%   if (service_config.content | b64decode | from_yaml).service == "LCOMService" %}
-          {% if (config_count > 0) %},{% endif %}"stereum-{{ (service_config.content | b64decode | from_yaml).id }}:8000"
-          {% set config_count = config_count + 1 %}
-{%   endif %}
+{% set targets = [] %}
+{%- for service_config in service_configs.results %}
+  {%- if (service_config.content | b64decode | from_yaml).service == "LCOMService" %}
+    {%- set _ = targets.append("stereum-" ~ (service_config.content | b64decode | from_yaml).id ~ ":8000") %}
+  {%- endif %}
 {% endfor %}
+{% if targets %}
+          "{{ targets | join('",\n          "') }}"
+{% endif %}
         ]
-        
+
   - job_name: csm_slow_metrics
     scrape_interval: 1m
     metrics_path: /metrics/slow
     static_configs:
       - targets: [
-{% set config_count = 0 %}
-{% for service_config in service_configs.results %}
-{%   if (service_config.content | b64decode | from_yaml).service == "LCOMService" %}
-          {% if (config_count > 0) %},{% endif %}"stereum-{{ (service_config.content | b64decode | from_yaml).id }}:8000"
-          {% set config_count = config_count + 1 %}
-{%   endif %}
+{% set targets = [] %}
+{%- for service_config in service_configs.results %}
+  {%- if (service_config.content | b64decode | from_yaml).service == "LCOMService" %}
+    {%- set _ = targets.append("stereum-" ~ (service_config.content | b64decode | from_yaml).id ~ ":8000") %}
+  {%- endif %}
 {% endfor %}
+{% if targets %}
+          "{{ targets | join('",\n          "') }}"
+{% endif %}
         ]
 
-# EOF
+# EOF
\ No newline at end of file