diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0eb931be98..749a99fccb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -190,3 +190,5 @@ significant modifications will be credited to OpenTelemetry Authors.
 ([#687](https://github.com/open-telemetry/opentelemetry-demo/pull/687))
 * Remove grpc from loadgenerator
 ([#688](https://github.com/open-telemetry/opentelemetry-demo/pull/688))
+* Update docker-compose services to restart unless stopped
+([#690](https://github.com/open-telemetry/opentelemetry-demo/pull/690))
diff --git a/docker-compose.yml b/docker-compose.yml
index b8a044ded5..d898ae28fa 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -41,7 +41,7 @@ services:
       resources:
         limits:
           memory: 20M
-    restart: always
+    restart: unless-stopped
     environment:
       - KAFKA_SERVICE_ADDR
       - OTEL_EXPORTER_OTLP_TRACES_ENDPOINT
@@ -69,7 +69,7 @@ services:
       resources:
         limits:
           memory: 300M
-    restart: always
+    restart: unless-stopped
     ports:
       - "${AD_SERVICE_PORT}"
     environment:
@@ -96,7 +96,7 @@ services:
       resources:
         limits:
           memory: 160M
-    restart: always
+    restart: unless-stopped
     ports:
       - "${CART_SERVICE_PORT}"
     environment:
@@ -124,7 +124,7 @@ services:
       resources:
         limits:
           memory: 20M
-    restart: always
+    restart: unless-stopped
     ports:
       - "${CHECKOUT_SERVICE_PORT}"
     environment:
@@ -175,7 +175,7 @@ services:
       resources:
         limits:
           memory: 20M
-    restart: always
+    restart: unless-stopped
     ports:
       - "${CURRENCY_SERVICE_PORT}"
     environment:
@@ -198,7 +198,7 @@ services:
       resources:
         limits:
           memory: 100M
-    restart: always
+    restart: unless-stopped
     ports:
       - "${EMAIL_SERVICE_PORT}"
     environment:
@@ -224,7 +224,7 @@ services:
       resources:
         limits:
           memory: 200M
-    restart: always
+    restart: unless-stopped
     ports:
       - "${FEATURE_FLAG_SERVICE_PORT}"                                  # Feature Flag Service UI
       - "${FEATURE_FLAG_GRPC_SERVICE_PORT}"                             # Feature Flag Service gRPC API
@@ -254,7 +254,7 @@ services:
       resources:
         limits:
           memory: 200M
-    restart: always
+    restart: unless-stopped
     environment:
       - KAFKA_SERVICE_ADDR
       - OTEL_EXPORTER_OTLP_TRACES_ENDPOINT
@@ -282,7 +282,7 @@ services:
       resources:
         limits:
           memory: 200M
-    restart: always
+    restart: unless-stopped
     ports:
       - "${FRONTEND_PORT}"
     environment:
@@ -357,7 +357,7 @@ services:
       resources:
         limits:
           memory: 120M
-    restart: always
+    restart: unless-stopped
     ports:
       - "${LOCUST_WEB_PORT}"
     environment:
@@ -387,7 +387,7 @@ services:
       resources:
         limits:
           memory: 70M
-    restart: always
+    restart: unless-stopped
     ports:
       - "${PAYMENT_SERVICE_PORT}"
     environment:
@@ -414,7 +414,7 @@ services:
       resources:
         limits:
           memory: 20M
-    restart: always
+    restart: unless-stopped
     ports:
       - "${PRODUCT_CATALOG_SERVICE_PORT}"
     environment:
@@ -442,7 +442,7 @@ services:
       resources:
         limits:
           memory: 30M
-    restart: always
+    restart: unless-stopped
     ports:
       - "${QUOTE_SERVICE_PORT}"
     environment:
@@ -468,7 +468,7 @@ services:
       resources:
         limits:
           memory: 500M               # This is high to enable supporting the recommendationCache feature flag use case
-    restart: always
+    restart: unless-stopped
     ports:
       - "${RECOMMENDATION_SERVICE_PORT}"
     environment:
@@ -502,7 +502,7 @@ services:
       resources:
         limits:
           memory: 20M
-    restart: always
+    restart: unless-stopped
     ports:
       - "${SHIPPING_SERVICE_PORT}"
     environment:
@@ -527,7 +527,7 @@ services:
       resources:
         limits:
           memory: 200M
-    restart: always
+    restart: unless-stopped
     environment:
       - POSTGRES_USER=ffs
       - POSTGRES_DB=ffs
@@ -552,7 +552,7 @@ services:
       resources:
         limits:
           memory: 800M
-    restart: always
+    restart: unless-stopped
     environment:
       - KAFKA_ADVERTISED_LISTENERS=PLAINTEXT://kafka:9092
       - OTEL_EXPORTER_OTLP_TRACES_ENDPOINT
@@ -577,7 +577,7 @@ services:
       resources:
         limits:
           memory: 20M
-    restart: always
+    restart: unless-stopped
     ports:
       - "${REDIS_PORT}"
     logging: *logging
@@ -601,7 +601,7 @@ services:
       resources:
         limits:
           memory: 275M
-    restart: always
+    restart: unless-stopped
     ports:
       - "${JAEGER_SERVICE_PORT}"                    # Jaeger UI
       - "4317"                           # OTLP gRPC default port
@@ -629,7 +629,7 @@ services:
       resources:
         limits:
           memory: 100M
-    restart: always
+    restart: unless-stopped
     command: [ "--config=/etc/otelcol-config.yml", "--config=/etc/otelcol-config-extras.yml" ]
     volumes:
       - ./src/otelcollector/otelcol-config.yml:/etc/otelcol-config.yml