diff --git a/config/tempo/tempo.yml b/config/tempo/tempo.yml
index 8a271e9..b52eb34 100644
--- a/config/tempo/tempo.yml
+++ b/config/tempo/tempo.yml
@@ -20,21 +20,13 @@ distributor:
 
 ingester:
   max_block_duration: 5m               # cut the headblock when this much time passes. this is being set for demo purposes and should probably be left alone normally
+  flush_all_on_shutdown: true
 
 compactor:
   compaction:
-    block_retention: 1h                # overall Tempo trace retention. set for demo purposes
+    block_retention: 336h              # Duration to keep blocks. Default is 14 days
 
 # 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
 
 storage:
   trace:
@@ -46,9 +38,4 @@ storage:
       endpoint: minio:9000
       access_key: ${MINIO_ROOT_USER}
       secret_key: ${MINIO_ROOT_PASSWORD}
-      insecure: true
-
-overrides:
-  defaults:
-    metrics_generator:
-      processors: [service-graphs, span-metrics] # enables metrics generator
\ No newline at end of file
+      insecure: true
\ No newline at end of file