diff --git a/values/kube-prometheus-stack.yaml b/values/kube-prometheus-stack.yaml
index fb80cdd..d7b3ad2 100644
--- a/values/kube-prometheus-stack.yaml
+++ b/values/kube-prometheus-stack.yaml
@@ -68,6 +68,8 @@ grafana:
           datasourceUid: prometheus
         nodeGraph:
           enabled: true
+        lokiSearch:
+          datasourceUid: loki
 
 prometheus:
   prometheusSpec:
diff --git a/values/tempo.yaml b/values/tempo.yaml
index 78dd842..642d1e7 100644
--- a/values/tempo.yaml
+++ b/values/tempo.yaml
@@ -1,4 +1,7 @@
 tempo:
+  metricsGenerator:
+    enabled: true
+    remoteWriteUrl: "http://kube-prometheus-stack-prometheus.monitoring.svc.cluster.local:9090/api/v1/write"
   storage:
     trace:
       backend: local