diff --git a/docker-compose.minimal.yml b/docker-compose.minimal.yml
index e34926f726..b467a80292 100644
--- a/docker-compose.minimal.yml
+++ b/docker-compose.minimal.yml
@@ -238,6 +238,7 @@ services:
       resources:
         limits:
           memory: 50M
+    restart: unless-stopped
     ports:
       - "${ENVOY_PORT}:${ENVOY_PORT}"
       - 10000:10000
diff --git a/docker-compose.yml b/docker-compose.yml
index 55ec39ecab..00f0a27061 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -312,6 +312,7 @@ services:
       resources:
         limits:
           memory: 50M
+    restart: unless-stopped
     ports:
       - "${ENVOY_PORT}:${ENVOY_PORT}"
       - 10000:10000