diff --git a/infra/values/prometheus-values.yaml b/infra/values/prometheus-values.yaml
index 8a65223..da797e5 100644
--- a/infra/values/prometheus-values.yaml
+++ b/infra/values/prometheus-values.yaml
@@ -13,7 +13,8 @@ server:
       memory: 1Gi
 
   enableLifecycle: true
-  enableRemoteWriteReceiver: true
+  extraFlags:
+    - web.enable-remote-write-receiver
 
 extraScrapeConfigs: |
   - job_name: kyverno
diff --git a/infra/values/tempo-values.yaml b/infra/values/tempo-values.yaml
index aee124a..9952fce 100644
--- a/infra/values/tempo-values.yaml
+++ b/infra/values/tempo-values.yaml
@@ -2,6 +2,12 @@ tempo:
   metricsGenerator:
     enabled: true
     remoteWriteUrl: "http://prometheus-server.monitoring.svc.cluster.local/api/v1/write"
+  overrides:
+    defaults:
+      metrics_generator:
+        processors:
+          - service-graphs
+          - span-metrics
   storage:
     trace:
       backend: local