diff --git a/infra/values/grafana-values.yaml b/infra/values/grafana-values.yaml
index 839de03..c495e10 100644
--- a/infra/values/grafana-values.yaml
+++ b/infra/values/grafana-values.yaml
@@ -36,14 +36,14 @@ datasources:
         tracesToLogsV2:
           datasourceUid: loki
           tags:
-            - key: namespace
-            - key: pod
-            - key: container
+          - key: namespace
+          - key: pod
+          - key: container
         tracesToMetrics:
           datasourceUid: Prometheus
           tags:
-            - key: service.name
-              value: service
+          - key: service.name
+            value: service
         nodeGraph:
           enabled: true
         serviceMap:
@@ -2263,4 +2263,4 @@ dashboards:
     opencost:
       gnetId: 15714
       revision: 1
-      datasource: Prometheus
+      datasource: ${datasource}