diff --git a/docker/telemetry/grafana/dashboards/consensus-health.json b/docker/telemetry/grafana/dashboards/consensus-health.json
index 80646b94ee..f6a3d21dc3 100644
--- a/docker/telemetry/grafana/dashboards/consensus-health.json
+++ b/docker/telemetry/grafana/dashboards/consensus-health.json
@@ -119,7 +119,8 @@
       ],
       "fieldConfig": {
         "defaults": {
-          "unit": "suffix: validations/s"
+          "unit": "si: validations/s",
+          "decimals": 0
         },
         "overrides": []
       },
diff --git a/docker/telemetry/grafana/dashboards/ledger-data-sync.json b/docker/telemetry/grafana/dashboards/ledger-data-sync.json
index 0d32621d9d..204f9c1b96 100644
--- a/docker/telemetry/grafana/dashboards/ledger-data-sync.json
+++ b/docker/telemetry/grafana/dashboards/ledger-data-sync.json
@@ -26,7 +26,7 @@
           "sort": "desc"
         },
         "displayMode": "gradient",
-        "namePlacement": "top",
+        "namePlacement": "auto",
         "orientation": "horizontal",
         "reduceOptions": {
           "calcs": ["lastNotNull"],
@@ -625,7 +625,8 @@
       "fieldConfig": {
         "defaults": {
           "displayName": "${__field.labels.series} [${__field.labels.service_instance_id} ${__field.labels.xrpl_branch} ${__field.labels.xrpl_node_role} ${__field.labels.xrpl_work_item}]",
-          "unit": "suffix: messages/s",
+          "unit": "si: messages/s",
+          "decimals": 0,
           "custom": {
             "axisLabel": "Messages / Sec",
             "spanNulls": 1800000,
@@ -679,7 +680,8 @@
       "fieldConfig": {
         "defaults": {
           "displayName": "${__field.labels.series} [${__field.labels.service_instance_id} ${__field.labels.xrpl_branch} ${__field.labels.xrpl_node_role} ${__field.labels.xrpl_work_item}]",
-          "unit": "suffix: messages/s",
+          "unit": "si: messages/s",
+          "decimals": 0,
           "custom": {
             "axisLabel": "Messages / Sec",
             "spanNulls": 1800000,
@@ -727,7 +729,8 @@
       "fieldConfig": {
         "defaults": {
           "displayName": "${__field.labels.series} [${__field.labels.service_instance_id} ${__field.labels.xrpl_branch} ${__field.labels.xrpl_node_role} ${__field.labels.xrpl_work_item}]",
-          "unit": "suffix: messages/s",
+          "unit": "si: messages/s",
+          "decimals": 0,
           "custom": {
             "axisLabel": "Messages / Sec",
             "spanNulls": 1800000,
@@ -787,7 +790,8 @@
       "fieldConfig": {
         "defaults": {
           "displayName": "${__field.labels.series} [${__field.labels.service_instance_id} ${__field.labels.xrpl_branch} ${__field.labels.xrpl_node_role} ${__field.labels.xrpl_work_item}]",
-          "unit": "suffix: messages/s",
+          "unit": "si: messages/s",
+          "decimals": 0,
           "custom": {
             "axisLabel": "Messages / Sec",
             "spanNulls": 1800000,
@@ -1128,7 +1132,7 @@
       ],
       "fieldConfig": {
         "defaults": {
-          "displayName": "State ${__field.labels.xrpl_ident}",
+          "displayName": "${__field.labels.xrpl_ident}",
           "unit": "none",
           "custom": {
             "fillOpacity": 80,
@@ -1243,7 +1247,8 @@
       "fieldConfig": {
         "defaults": {
           "displayName": "${__field.labels.series} ${__field.labels.xrpl_ident}",
-          "unit": "suffix: ledgers/s",
+          "unit": "si: ledgers/s",
+          "decimals": 0,
           "custom": {
             "axisLabel": "Ledgers / Sec & Fetches / Sec",
             "spanNulls": 1800000,
@@ -1554,7 +1559,8 @@
       "fieldConfig": {
         "defaults": {
           "displayName": "${__field.labels.series} ${__field.labels.xrpl_ident}",
-          "unit": "suffix: reads/s",
+          "unit": "si: reads/s",
+          "decimals": 0,
           "custom": {
             "axisLabel": "Reads / Sec & Depth",
             "spanNulls": 1800000,
diff --git a/docker/telemetry/grafana/dashboards/ledger-operations.json b/docker/telemetry/grafana/dashboards/ledger-operations.json
index 5797cbcc6b..89b2506313 100644
--- a/docker/telemetry/grafana/dashboards/ledger-operations.json
+++ b/docker/telemetry/grafana/dashboards/ledger-operations.json
@@ -49,7 +49,8 @@
       ],
       "fieldConfig": {
         "defaults": {
-          "unit": "suffix: ledgers/s"
+          "unit": "si: ledgers/s",
+          "decimals": 0
         },
         "overrides": []
       },
@@ -86,7 +87,8 @@
       ],
       "fieldConfig": {
         "defaults": {
-          "unit": "suffix: ledgers/s"
+          "unit": "si: ledgers/s",
+          "decimals": 0
         },
         "overrides": []
       },
@@ -364,7 +366,8 @@
       ],
       "fieldConfig": {
         "defaults": {
-          "unit": "suffix: ledgers/s"
+          "unit": "si: ledgers/s",
+          "decimals": 0
         },
         "overrides": []
       },
diff --git a/docker/telemetry/grafana/dashboards/network-traffic.json b/docker/telemetry/grafana/dashboards/network-traffic.json
index 2e3d8e89eb..6e9dbc1a6d 100644
--- a/docker/telemetry/grafana/dashboards/network-traffic.json
+++ b/docker/telemetry/grafana/dashboards/network-traffic.json
@@ -218,7 +218,8 @@
       "fieldConfig": {
         "defaults": {
           "displayName": "${__field.labels.series} [${__field.labels.service_instance_id} ${__field.labels.xrpl_branch} ${__field.labels.xrpl_node_role} ${__field.labels.xrpl_work_item}]",
-          "unit": "suffix: messages/s",
+          "unit": "si: messages/s",
+          "decimals": 0,
           "custom": {
             "axisLabel": "Messages / Sec",
             "spanNulls": 1800000,
@@ -278,7 +279,8 @@
       "fieldConfig": {
         "defaults": {
           "displayName": "${__field.labels.series} [${__field.labels.service_instance_id} ${__field.labels.xrpl_branch} ${__field.labels.xrpl_node_role} ${__field.labels.xrpl_work_item}]",
-          "unit": "suffix: messages/s",
+          "unit": "si: messages/s",
+          "decimals": 0,
           "custom": {
             "axisLabel": "Messages / Sec",
             "spanNulls": 1800000,
@@ -344,7 +346,8 @@
       "fieldConfig": {
         "defaults": {
           "displayName": "${__field.labels.series} [${__field.labels.service_instance_id} ${__field.labels.xrpl_branch} ${__field.labels.xrpl_node_role} ${__field.labels.xrpl_work_item}]",
-          "unit": "suffix: messages/s",
+          "unit": "si: messages/s",
+          "decimals": 0,
           "custom": {
             "axisLabel": "Messages / Sec",
             "spanNulls": 1800000,
@@ -410,7 +413,8 @@
       "fieldConfig": {
         "defaults": {
           "displayName": "${__field.labels.series} [${__field.labels.service_instance_id} ${__field.labels.xrpl_branch} ${__field.labels.xrpl_node_role} ${__field.labels.xrpl_work_item}]",
-          "unit": "suffix: messages/s",
+          "unit": "si: messages/s",
+          "decimals": 0,
           "custom": {
             "axisLabel": "Messages / Sec",
             "spanNulls": 1800000,
diff --git a/docker/telemetry/grafana/dashboards/node-health.json b/docker/telemetry/grafana/dashboards/node-health.json
index 6501e82369..9102791961 100644
--- a/docker/telemetry/grafana/dashboards/node-health.json
+++ b/docker/telemetry/grafana/dashboards/node-health.json
@@ -140,7 +140,8 @@
       ],
       "fieldConfig": {
         "defaults": {
-          "unit": "suffix: fetches/s"
+          "unit": "si: fetches/s",
+          "decimals": 0
         },
         "overrides": []
       },
@@ -176,7 +177,8 @@
       ],
       "fieldConfig": {
         "defaults": {
-          "unit": "suffix: mismatches/s",
+          "unit": "si: mismatches/s",
+          "decimals": 0,
           "thresholds": {
             "steps": [
               {
diff --git a/docker/telemetry/grafana/dashboards/overlay-traffic-detail.json b/docker/telemetry/grafana/dashboards/overlay-traffic-detail.json
index 6ce38c9271..1fc334288b 100644
--- a/docker/telemetry/grafana/dashboards/overlay-traffic-detail.json
+++ b/docker/telemetry/grafana/dashboards/overlay-traffic-detail.json
@@ -71,7 +71,8 @@
       "fieldConfig": {
         "defaults": {
           "displayName": "${__field.labels.series} [${__field.labels.service_instance_id} ${__field.labels.xrpl_branch} ${__field.labels.xrpl_node_role} ${__field.labels.xrpl_work_item}]",
-          "unit": "suffix: messages/s",
+          "unit": "si: messages/s",
+          "decimals": 0,
           "custom": {
             "axisLabel": "Messages / Sec",
             "spanNulls": 1800000,
@@ -215,7 +216,8 @@
       "fieldConfig": {
         "defaults": {
           "displayName": "${__field.labels.series} [${__field.labels.service_instance_id} ${__field.labels.xrpl_branch} ${__field.labels.xrpl_node_role} ${__field.labels.xrpl_work_item}]",
-          "unit": "suffix: messages/s",
+          "unit": "si: messages/s",
+          "decimals": 0,
           "custom": {
             "axisLabel": "Messages / Sec & Bytes / Sec",
             "spanNulls": 1800000,
@@ -364,7 +366,8 @@
       "fieldConfig": {
         "defaults": {
           "displayName": "${__field.labels.series} [${__field.labels.service_instance_id} ${__field.labels.xrpl_branch} ${__field.labels.xrpl_node_role} ${__field.labels.xrpl_work_item}]",
-          "unit": "suffix: messages/s",
+          "unit": "si: messages/s",
+          "decimals": 0,
           "custom": {
             "axisLabel": "Messages / Sec",
             "spanNulls": 1800000,
diff --git a/docker/telemetry/grafana/dashboards/rpc-pathfinding.json b/docker/telemetry/grafana/dashboards/rpc-pathfinding.json
index aa7cf2e579..da69f37df2 100644
--- a/docker/telemetry/grafana/dashboards/rpc-pathfinding.json
+++ b/docker/telemetry/grafana/dashboards/rpc-pathfinding.json
@@ -287,7 +287,8 @@
       ],
       "fieldConfig": {
         "defaults": {
-          "unit": "suffix: warnings/s",
+          "unit": "si: warnings/s",
+          "decimals": 0,
           "thresholds": {
             "steps": [
               {
@@ -340,7 +341,8 @@
       ],
       "fieldConfig": {
         "defaults": {
-          "unit": "suffix: drops/s",
+          "unit": "si: drops/s",
+          "decimals": 0,
           "thresholds": {
             "steps": [
               {
@@ -525,7 +527,8 @@
       ],
       "fieldConfig": {
         "defaults": {
-          "unit": "suffix: calls/s",
+          "unit": "si: calls/s",
+          "decimals": 0,
           "custom": {
             "axisLabel": "Calls / Sec",
             "spanNulls": 1800000,
@@ -623,7 +626,8 @@
       ],
       "fieldConfig": {
         "defaults": {
-          "unit": "suffix: calls/s",
+          "unit": "si: calls/s",
+          "decimals": 0,
           "custom": {
             "axisLabel": "Calls / Sec",
             "spanNulls": 1800000,
@@ -737,7 +741,8 @@
       ],
       "fieldConfig": {
         "defaults": {
-          "unit": "suffix: operations/s",
+          "unit": "si: operations/s",
+          "decimals": 0,
           "custom": {
             "axisLabel": "Operations / Sec",
             "spanNulls": 1800000,
diff --git a/docker/telemetry/grafana/dashboards/rpc-performance.json b/docker/telemetry/grafana/dashboards/rpc-performance.json
index bb264b823d..8e19832dd0 100644
--- a/docker/telemetry/grafana/dashboards/rpc-performance.json
+++ b/docker/telemetry/grafana/dashboards/rpc-performance.json
@@ -126,7 +126,8 @@
       ],
       "fieldConfig": {
         "defaults": {
-          "unit": "suffix: messages/s"
+          "unit": "si: messages/s",
+          "decimals": 0
         },
         "overrides": []
       },
diff --git a/docker/telemetry/grafana/dashboards/transaction-overview.json b/docker/telemetry/grafana/dashboards/transaction-overview.json
index 6c52b04c9c..7b61eb78d5 100644
--- a/docker/telemetry/grafana/dashboards/transaction-overview.json
+++ b/docker/telemetry/grafana/dashboards/transaction-overview.json
@@ -37,7 +37,8 @@
       ],
       "fieldConfig": {
         "defaults": {
-          "unit": "suffix: transactions/s",
+          "unit": "si: transactions/s",
+          "decimals": 0,
           "thresholds": {
             "steps": [
               {