diff --git a/docker-compose.yml b/docker-compose.yml
index 37d208e..ad8eb75 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -93,19 +93,23 @@ services:
         - GF_AUTH_DISABLE_LOGIN_FORM=true
     ports:
       - "3000:3000"
-#  k6-tracing:
-#    image: ghcr.io/grafana/xk6-client-tracing:latest
-#    environment:
-#      - ENDPOINT=tempo:3201
-#    restart: always
-#    depends_on:
-#      - tempo
   prometheus:
     image: prom/prometheus:v2.49.1
+    command:
+      - --config.file=/etc/prometheus/prometheus.yml
+#      - --enable-feature=exemplar-storage
+      - --web.enable-remote-write-receiver
     volumes:
       - ./prometheus/config.yml:/etc/prometheus/prometheus.yml
     ports:
       - "9090:9090"
     depends_on:
       otel-collector:
-        condition: service_started
\ No newline at end of file
+        condition: service_started
+#  k6-tracing:
+#    image: ghcr.io/grafana/xk6-client-tracing:latest
+#    environment:
+#      - ENDPOINT=tempo:3201
+#    restart: always
+#    depends_on:
+#      - tempo
\ No newline at end of file
diff --git a/grafana/datasources.yml b/grafana/datasources.yml
index 9abc1ec..d9fd0ac 100644
--- a/grafana/datasources.yml
+++ b/grafana/datasources.yml
@@ -1,15 +1,5 @@
 apiVersion: 1
 datasources:
-  - name: Tempo
-    apiVersion: 1
-    version: 1
-    type: tempo
-    uid: tempo
-    url: http://tempo:3200
-    access: proxy
-    basicAuth: false
-    isDefault: true
-    editable: false
   - name: Prometheus
     apiVersion: 1
     version: 1
@@ -20,3 +10,19 @@ datasources:
     basicAuth: false
     isDefault: false
     editable: false
+    jsonData:
+      httpMethod: GET
+  - name: Tempo
+    apiVersion: 1
+    version: 1
+    type: tempo
+    uid: tempo
+    url: http://tempo:3200
+    access: proxy
+    basicAuth: false
+    isDefault: true
+    editable: false
+    jsonData:
+      httpMethod: GET
+      serviceMap:
+        datasourceUid: prometheus
diff --git a/prometheus/config.yml b/prometheus/config.yml
index 3d7e188..78cb563 100644
--- a/prometheus/config.yml
+++ b/prometheus/config.yml
@@ -1,7 +1,6 @@
 global:
   scrape_interval: 5s
-scrape_configs:
-  - job_name: otel-collector
-    static_configs:
-      - targets:
-        - 'otel-collector:8889'
\ No newline at end of file
+#scrape_configs:
+#  - job_name: otel-collector
+#    static_configs:
+#      - targets: ['otel-collector:8889']
diff --git a/tempo/config.yml b/tempo/config.yml
index 3ea411a..e4db3da 100644
--- a/tempo/config.yml
+++ b/tempo/config.yml
@@ -15,4 +15,18 @@ storage:
     local:
       path: /tmp/tempo/blocks
     wal:
-      path: /tmp/tempo/wal
\ No newline at end of file
+      path: /tmp/tempo/wal
+metrics_generator:
+  registry:
+    external_labels:
+      source: tempo
+      cluster: docker-compose
+  storage:
+    path: /tmp/tempo/generator/wal
+    remote_write:
+      - url: http://prometheus:9090/api/v1/write
+#        send_exemplars: true
+overrides:
+  defaults:
+    metrics_generator:
+      processors: [service-graphs, span-metrics]
\ No newline at end of file