diff --git a/docker-compose.yaml b/docker-compose.yaml
index d5c26c1..f711404 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -90,7 +90,7 @@ services:
       GF_AUTH_GENERIC_OAUTH_ROLE_ATTRIBUTE_STRICT: "true"
     volumes:
       - grafana_data:/var/lib/grafana
-      - ./grafana/datasources.yaml:/etc/grafana/provisioning/datasources/ds.yaml
+      - ./grafana/datasources.yaml:/etc/grafana/provisioning/datasources.yaml
     ports:
       - ${GRAFANA_PORT}:3000
     networks:
diff --git a/grafana/datasources.yaml b/grafana/datasources.yaml
index df8758e..5c22a95 100644
--- a/grafana/datasources.yaml
+++ b/grafana/datasources.yaml
@@ -1,6 +1,33 @@
 apiVersion: 1
 datasources:
+  - name: Tempo
+    type: tempo
+    access: proxy
+    orgId: 1
+    url: http://tempo:3200
+    basicAuth: false
+    isDefault: true
+    version: 1
+    editable: false
+    apiVersion: 1
+    uid: tempo
+    jsonData:
+      httpMethod: GET
+      serviceMap:
+        datasourceUid: prometheus
+      tracesToProfiles:
+        customQuery: false
+        datasourceUid: "pyroscope"
+        profileTypeId: "process_cpu:cpu:nanoseconds:cpu:nanoseconds"
+      tracesToLogs:
+        datasourceUid: loki
+        mapTagNamesEnabled: true
+        spanStartTimeShift: "1h"
+        spanEndTimeShift: "1h"
+        filterByTraceID: true
+        filterBySpanID: true
   - name: Loki
+    uid: loki
     type: loki
     access: proxy
     orgId: 1
@@ -10,6 +37,7 @@ datasources:
     version: 1
     editable: false
   - name: Prometheus
+    uid: prometheus
     type: prometheus
     access: proxy
     orgId: 1
@@ -18,23 +46,9 @@ datasources:
     isDefault: false
     version: 1
     editable: false
-  - name: Tempo
-    type: tempo
-    access: proxy
-    orgId: 1
-    url: http://tempo:3200
-    basicAuth: false
-    isDefault: false
-    version: 1
-    editable: false
-    jsonData:
-      httpMethod: GET
   - name: Pyroscope
-    type: pyroscope
+    uid: pyroscope
+    type: grafana-pyroscope-datasource
     access: proxy
     orgId: 1
-    url: http://pyroscope:3200
-    basicAuth: false
-    isDefault: false
-    version: 1
-    editable: false
+    url: http://pyroscope:4040