diff --git a/docker/telemetry/grafana/provisioning/datasources/tempo.yaml b/docker/telemetry/grafana/provisioning/datasources/tempo.yaml
index 27b6596b0c..03b232c000 100644
--- a/docker/telemetry/grafana/provisioning/datasources/tempo.yaml
+++ b/docker/telemetry/grafana/provisioning/datasources/tempo.yaml
@@ -94,30 +94,30 @@ datasources:
             type: static
           # Phase 2: RPC tracing filters
           - id: rpc-command
-            tag: xrpl.rpc.command
+            tag: command
             operator: "="
             scope: span
             type: static
           - id: rpc-status
-            tag: xrpl.rpc.status
+            tag: rpc_status
             operator: "="
             scope: span
             type: dynamic
           - id: rpc-role
-            tag: xrpl.rpc.role
+            tag: rpc_role
             operator: "="
             scope: span
             type: dynamic
-          # Phase 2: Node health filters (Task 2.8)
+          # Phase 2: Node health filters (Task 2.8) — resource attributes
           - id: node-amendment-blocked
             tag: xrpl.node.amendment_blocked
             operator: "="
-            scope: span
+            scope: resource
             type: static
           - id: node-server-state
             tag: xrpl.node.server_state
             operator: "="
-            scope: span
+            scope: resource
             type: dynamic
           # Phase 3: Transaction tracing filters
           - id: tx-hash
@@ -126,12 +126,12 @@ datasources:
             scope: span
             type: static
           - id: tx-origin
-            tag: xrpl.tx.local
+            tag: local
             operator: "="
             scope: span
             type: dynamic
           - id: tx-status
-            tag: xrpl.tx.status
+            tag: tx_status
             operator: "="
             scope: span
             type: dynamic
@@ -147,22 +147,22 @@ datasources:
             scope: span
             type: dynamic
           - id: consensus-ledger-seq
-            tag: xrpl.consensus.ledger.seq
+            tag: xrpl.ledger.seq
             operator: "="
             scope: span
             type: static
           - id: consensus-close-time-correct
-            tag: xrpl.consensus.close_time_correct
+            tag: close_time_correct
             operator: "="
             scope: span
             type: dynamic
           - id: consensus-state
-            tag: xrpl.consensus.state
+            tag: consensus_state
             operator: "="
             scope: span
             type: dynamic
           - id: consensus-close-resolution
-            tag: xrpl.consensus.close_resolution_ms
+            tag: close_resolution_ms
             operator: "="
             scope: span
             type: dynamic