diff --git a/compose-entry.template.yml b/compose-entry.template.yml
index 16b166e11..80869140d 100644
--- a/compose-entry.template.yml
+++ b/compose-entry.template.yml
@@ -18,6 +18,7 @@ services:
     nginx:
       image: "${DOCKER_REGISTRY}/wres/nginx"
       container_name: nginx_proxy
+      restart: always
       volumes:
         - ${NGINX_SERVER_CERT}:/etc/nginx/cert/wres_server_cert.pem
         - ${NGINX_SERVER_KEY}:/etc/nginx/cert/wres_server_key.pem
@@ -30,6 +31,7 @@ services:
     cadvisor:
       image: gcr.io/cadvisor/cadvisor:latest
       container_name: cadvisor
+      restart: always
       ports:
         - 8080:8080
       volumes:
diff --git a/compose-workers.template.yml b/compose-workers.template.yml
index 032491865..54f97ed4d 100644
--- a/compose-workers.template.yml
+++ b/compose-workers.template.yml
@@ -18,6 +18,7 @@ services:
     nginx:
       image: "${DOCKER_REGISTRY}/wres/nginx"
       container_name: nginx_proxy
+      restart: always
       volumes:
         - ${NGINX_SERVER_CERT}:/etc/nginx/cert/wres_server_cert.pem
         - ${NGINX_SERVER_KEY}:/etc/nginx/cert/wres_server_key.pem
@@ -30,6 +31,7 @@ services:
     cadvisor:
       image: gcr.io/cadvisor/cadvisor:latest
       container_name: cadvisor
+      restart: always
       ports:
         - 8080:8080
       volumes: