diff --git a/charts/base-cluster/templates/monitoring/loki/loki.yaml b/charts/base-cluster/templates/monitoring/loki/loki.yaml
index 605ac057c..5e09be99a 100644
--- a/charts/base-cluster/templates/monitoring/loki/loki.yaml
+++ b/charts/base-cluster/templates/monitoring/loki/loki.yaml
@@ -68,6 +68,8 @@ spec:
               object_store: filesystem
               schema: v9
               store: boltdb
+      datasource:
+        uid: loki
 {{/* TODO: Implement */}}
 {{/*            - from: 2022-09-15*/}}
 {{/*              store: boltdb-shipper*/}}
diff --git a/charts/base-cluster/templates/monitoring/tracing/grafana-tempo.yaml b/charts/base-cluster/templates/monitoring/tracing/grafana-tempo.yaml
index 345472feb..c00812e7e 100644
--- a/charts/base-cluster/templates/monitoring/tracing/grafana-tempo.yaml
+++ b/charts/base-cluster/templates/monitoring/tracing/grafana-tempo.yaml
@@ -50,9 +50,19 @@ data:
       - name: Tempo
         type: tempo
         access: proxy
+        uid: tempo
         url: "http://grafana-tempo-query-frontend.monitoring:3200"
         version: 1
         isDefault: false
         jsonData:
-          {}
+          tracesToLogsV2:
+            datasourceUid: loki
+          tracesToMetrics:
+            datasourceUid: prometheus
+          nodeGraph:
+            enabled: true
+          serviceMap:
+            datasourceUid: prometheus
+          lokiSearch:
+            datasourceUid: loki
 {{- end -}}