diff --git a/.env b/.env
index be7a0fbe26..dd461ad101 100644
--- a/.env
+++ b/.env
@@ -107,3 +107,4 @@ JAEGER_SERVICE_HOST=jaeger
 # Prometheus
 PROMETHEUS_SERVICE_PORT=9090
 PROMETHEUS_SERVICE_HOST=prometheus
+PROMETHEUS_ADDR=${PROMETHEUS_SERVICE_HOST}:${PROMETHEUS_SERVICE_PORT}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4205d4c772..d122bb058e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -164,3 +164,5 @@ significant modifications will be credited to OpenTelemetry Authors.
 ([#651](https://github.com/open-telemetry/opentelemetry-demo/pull/651))
 * Add resource detectors to frontend service
 ([#648](https://github.com/open-telemetry/opentelemetry-demo/pull/648))
+* Add Jaeger-SPM-Config
+([#655](https://github.com/open-telemetry/opentelemetry-demo/pull/655))
diff --git a/docker-compose.yml b/docker-compose.yml
index 50c2b56629..900dc7d461 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -575,7 +575,13 @@ services:
   jaeger:
     image: jaegertracing/all-in-one
     container_name: jaeger
-    command: ["--memory.max-traces", "10000", "--query.base-path", "/jaeger/ui"]
+    command:
+      - "--memory.max-traces"
+      - "10000"
+      - "--query.base-path"
+      - "/jaeger/ui"
+      - "--prometheus.server-url"
+      - "http://${PROMETHEUS_ADDR}"
     deploy:
       resources:
         limits:
@@ -586,6 +592,7 @@ services:
       - "4317"                           # OTLP gRPC default port
     environment:
       - COLLECTOR_OTLP_ENABLED=true
+      - METRICS_STORAGE_TYPE=prometheus
     logging: *logging
 
   # Grafana