diff --git a/core/docker-compose.yml b/core/docker-compose.yml
index d86fa564e..e06d66f31 100644
--- a/core/docker-compose.yml
+++ b/core/docker-compose.yml
@@ -12,7 +12,7 @@ services:
       - ../../config/core-config-envs
     logging:
       driver: "json-file"
-    restart: on-failure
+    restart: unless-stopped
     depends_on:
       glowroot-central:
         condition: service_started
@@ -25,7 +25,7 @@ services:
     ports:
       - "${RABBITMQ_PORT}:5672"
       - "${RABBITMQ_ADMIN_PORT}:15672"
-    restart: on-failure
+    restart: unless-stopped
     healthcheck:
       # rabbitmq server crashes if any rabbitmq-diagnostics cmd is run very soon
       # after starting, so can't check too aggressively here
@@ -67,6 +67,7 @@ services:
         - portal-build-secrets
     env_file:
       - ../../config/portal-config-envs
+    restart: unless-stopped
     ports:
       - "${PORTAL_PORT}:80"
 
diff --git a/hl7-reader/docker-compose.yml b/hl7-reader/docker-compose.yml
index 13be59d35..4de7616c5 100644
--- a/hl7-reader/docker-compose.yml
+++ b/hl7-reader/docker-compose.yml
@@ -12,7 +12,9 @@ services:
       - ../../config/hl7-reader-config-envs
     logging:
       driver: "json-file"
-    restart: "no"
+    # This service can legitimately exit 0 when it reaches
+    # the end of its configured run, so shouldn't restart in that case.
+    restart: on-failure
     depends_on:
       # Uses services from core, orchestrate using the EMAP setup package
       - glowroot-central
diff --git a/monitoring/docker-compose.yml b/monitoring/docker-compose.yml
index bce28a089..32a54fef5 100644
--- a/monitoring/docker-compose.yml
+++ b/monitoring/docker-compose.yml
@@ -12,4 +12,4 @@ services:
       - ../../config/streamlit-config-envs
     logging:
       driver: "json-file"
-    restart: "no"
+    restart: unless-stopped
diff --git a/waveform-generator/docker-compose.yml b/waveform-generator/docker-compose.yml
index be72c753a..15d7f129c 100644
--- a/waveform-generator/docker-compose.yml
+++ b/waveform-generator/docker-compose.yml
@@ -14,6 +14,6 @@ services:
       - ../../config/waveform-generator-config-envs
     logging:
       driver: "json-file"
-    restart: "no"
+    restart: on-failure
     depends_on:
       - waveform-reader
diff --git a/waveform-reader/docker-compose.yml b/waveform-reader/docker-compose.yml
index 824a2d624..073b05f30 100644
--- a/waveform-reader/docker-compose.yml
+++ b/waveform-reader/docker-compose.yml
@@ -16,7 +16,7 @@ services:
       - "7777:7777"
     logging:
       driver: "json-file"
-    restart: "no"
+    restart: on-failure
     volumes:
       - ../../waveform-test-data:/waveform-test-data:ro
     depends_on: