diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index e4b0f0895..7b5236e1b 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -23,18 +23,14 @@ services:
       - webapp
     deploy:
       restart_policy:
-        condition: on-failure
-        delay: 5s
-        window: 120s
+        condition: unless-stopped
 
   webapp:
     container_name: bigcapital-webapp
     image: ghcr.io/bigcapitalhq/webapp:latest
     deploy:
       restart_policy:
-        condition: on-failure
-        delay: 5s
-        window: 120s
+        condition: unless-stopped
 
   server:
     container_name: bigcapital-server
@@ -49,9 +45,7 @@ services:
       - redis
     deploy:
       restart_policy:
-        condition: on-failure
-        delay: 5s
-        window: 120s
+        condition: unless-stopped
     environment:
       # Mail
       - MAIL_HOST=${MAIL_HOST}
@@ -129,9 +123,7 @@ services:
     container_name: bigcapital-mongo
     deploy:
       restart_policy:
-        condition: on-failure
-        delay: 5s
-        window: 120s
+        condition: unless-stopped
     build: ./docker/mongo
     expose:
       - '27017'
@@ -142,9 +134,7 @@ services:
     container_name: bigcapital-redis
     deploy:
       restart_policy:
-        condition: on-failure
-        delay: 5s
-        window: 120s
+        condition: unless-stopped
     build:
       context: ./docker/redis
     expose:
diff --git a/docker-compose.yml b/docker-compose.yml
index 8df1498f6..9563ae91e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,9 +22,7 @@ services:
       - '3306:3306'
     deploy:
       restart_policy:
-        condition: on-failure
-        delay: 5s
-        window: 120s
+        condition: unless-stopped
 
   mongo:
     build: ./docker/mongo
@@ -36,9 +34,7 @@ services:
       - '27017:27017'
     deploy:
       restart_policy:
-        condition: on-failure
-        delay: 5s
-        window: 120s
+        condition: unless-stopped
 
   redis:
     build:
@@ -49,9 +45,7 @@ services:
       - redis:/data
     deploy:
       restart_policy:
-        condition: on-failure
-        delay: 5s
-        window: 120s
+        condition: unless-stopped
 
 # Volumes
 volumes: