diff --git a/docker-compose-v1.yml b/docker-compose-v1.yml
index 6250040..a561e19 100644
--- a/docker-compose-v1.yml
+++ b/docker-compose-v1.yml
@@ -1,6 +1,6 @@
 db:
   build: db
-  restart: always
+  restart: unless-stopped
   volumes:
     - ./volumes/db/var/lib/postgresql/data:/var/lib/postgresql/data
     - /etc/localtime:/etc/localtime:ro
@@ -19,7 +19,7 @@ app:
   build: app
   links:
     - db:db
-  restart: always
+  restart: unless-stopped
   volumes:
     - ./volumes/app/mattermost/config:/mattermost/config:rw
     - ./volumes/app/mattermost/data:/mattermost/data:rw
@@ -37,7 +37,7 @@ web:
     - "443:443"
   links:
     - app:app
-  restart: always
+  restart: unless-stopped
   volumes:
       # This directory must have cert files
     - ./volumes/web/cert:/cert:ro
diff --git a/docker-compose.yml b/docker-compose.yml
index 39baaf0..4f4f40b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,7 +4,7 @@ services:
 
   db:
     build: db
-    restart: always
+    restart: unless-stopped
     volumes:
       - ./volumes/db/var/lib/postgresql/data:/var/lib/postgresql/data
       - /etc/localtime:/etc/localtime:ro
@@ -22,7 +22,7 @@ services:
 
   app:
     build: app
-    restart: always
+    restart: unless-stopped
     volumes:
       - ./volumes/app/mattermost/config:/mattermost/config:rw
       - ./volumes/app/mattermost/data:/mattermost/data:rw
@@ -38,7 +38,7 @@ services:
     ports:
       - "80:80"
       - "443:443"
-    restart: always
+    restart: unless-stopped
     volumes:
       # This directory must have cert files
       - ./volumes/web/cert:/cert:ro