diff --git a/playbooks/roles/jaeger/templates/docker-compose.yaml.j2 b/playbooks/roles/jaeger/templates/docker-compose.yaml.j2
index 467e956041..d9388ba584 100644
--- a/playbooks/roles/jaeger/templates/docker-compose.yaml.j2
+++ b/playbooks/roles/jaeger/templates/docker-compose.yaml.j2
@@ -12,7 +12,7 @@ services:
       - BADGER_EPHEMERAL=false
       - BADGER_DIRECTORY_VALUE=/badger/data
       - BADGER_DIRECTORY_KEY=/badger/key
-      - BADGER_SPAN_STORE_TTL=30d
+      - BADGER_SPAN_STORE_TTL=720h
       - COLLECTOR_OTLP_ENABLED=true
       - COLLECTOR_OTLP_GRPC_TLS_ENABLED=true
       - COLLECTOR_OTLP_GRPC_TLS_CERT=/tls/certs/cert.pem
@@ -21,3 +21,4 @@ services:
     volumes:
       - /var/jaeger/badger:/badger
       - /var/jaeger/tls:/tls
+    user: "{{ jaeger_uid }}:{{ jaeger_gid }}"