diff --git a/docker/telemetry/grafana/dashboards/system-ledger-data-sync.json b/docker/telemetry/grafana/dashboards/system-ledger-data-sync.json
index 25d537d98c..f58d70b5f9 100644
--- a/docker/telemetry/grafana/dashboards/system-ledger-data-sync.json
+++ b/docker/telemetry/grafana/dashboards/system-ledger-data-sync.json
@@ -501,7 +501,7 @@
         "label": "Node",
         "description": "Filter by rippled node (service.instance.id)",
         "type": "query",
-        "query": "label_values(exported_instance)",
+        "query": "label_values(rippled_ledger_data_get_Bytes_In, exported_instance)",
         "datasource": {
           "type": "prometheus",
           "uid": "prometheus"
diff --git a/docker/telemetry/grafana/dashboards/system-network-traffic.json b/docker/telemetry/grafana/dashboards/system-network-traffic.json
index e9dc47f10f..881eeeb970 100644
--- a/docker/telemetry/grafana/dashboards/system-network-traffic.json
+++ b/docker/telemetry/grafana/dashboards/system-network-traffic.json
@@ -666,7 +666,7 @@
         "label": "Node",
         "description": "Filter by rippled node (service.instance.id)",
         "type": "query",
-        "query": "label_values(exported_instance)",
+        "query": "label_values(rippled_Peer_Finder_Active_Inbound_Peers, exported_instance)",
         "datasource": {
           "type": "prometheus",
           "uid": "prometheus"
diff --git a/docker/telemetry/grafana/dashboards/system-node-health.json b/docker/telemetry/grafana/dashboards/system-node-health.json
index 49ac731528..3fa987210c 100644
--- a/docker/telemetry/grafana/dashboards/system-node-health.json
+++ b/docker/telemetry/grafana/dashboards/system-node-health.json
@@ -410,7 +410,7 @@
         "label": "Node",
         "description": "Filter by rippled node (service.instance.id)",
         "type": "query",
-        "query": "label_values(exported_instance)",
+        "query": "label_values(rippled_LedgerMaster_Validated_Ledger_Age, exported_instance)",
         "datasource": {
           "type": "prometheus",
           "uid": "prometheus"
diff --git a/docker/telemetry/grafana/dashboards/system-overlay-traffic-detail.json b/docker/telemetry/grafana/dashboards/system-overlay-traffic-detail.json
index aa4c32b97c..b1f407d1ed 100644
--- a/docker/telemetry/grafana/dashboards/system-overlay-traffic-detail.json
+++ b/docker/telemetry/grafana/dashboards/system-overlay-traffic-detail.json
@@ -561,7 +561,7 @@
         "label": "Node",
         "description": "Filter by rippled node (service.instance.id)",
         "type": "query",
-        "query": "label_values(exported_instance)",
+        "query": "label_values(rippled_squelch_Messages_In, exported_instance)",
         "datasource": {
           "type": "prometheus",
           "uid": "prometheus"
diff --git a/docker/telemetry/grafana/dashboards/system-rpc-pathfinding.json b/docker/telemetry/grafana/dashboards/system-rpc-pathfinding.json
index fa8104e522..2d7cded78d 100644
--- a/docker/telemetry/grafana/dashboards/system-rpc-pathfinding.json
+++ b/docker/telemetry/grafana/dashboards/system-rpc-pathfinding.json
@@ -391,7 +391,7 @@
         "label": "Node",
         "description": "Filter by rippled node (service.instance.id)",
         "type": "query",
-        "query": "label_values(exported_instance)",
+        "query": "label_values(rippled_rpc_requests_total, exported_instance)",
         "datasource": {
           "type": "prometheus",
           "uid": "prometheus"