diff --git a/compose.yaml b/compose.yaml
index 628de532..7c8e64f2 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -4,6 +4,7 @@ x-customizable-image: &customizable_image
   # about using custom images.
   image: ${CUSTOM_IMAGE:-frappe/erpnext}:${CUSTOM_TAG:-$ERPNEXT_VERSION}
   pull_policy: ${PULL_POLICY:-always}
+  restart: ${RESTART_POLICY:-unless-stopped}
 
 x-depends-on-configurator: &depends_on_configurator
   depends_on:
@@ -39,6 +40,7 @@ services:
       REDIS_QUEUE: ${REDIS_QUEUE:-}
       SOCKETIO_PORT: 9000
     depends_on: {}
+    restart: on-failure
 
   backend:
     <<: *backend_defaults
diff --git a/overrides/compose.https.yaml b/overrides/compose.https.yaml
index 8d78602a..9096e560 100644
--- a/overrides/compose.https.yaml
+++ b/overrides/compose.https.yaml
@@ -9,6 +9,7 @@ services:
 
   proxy:
     image: traefik:v2.11
+    restart: unless-stopped
     command:
       - --providers.docker=true
       - --providers.docker.exposedbydefault=false
diff --git a/overrides/compose.mariadb.yaml b/overrides/compose.mariadb.yaml
index 3dee180f..1d6e55c6 100644
--- a/overrides/compose.mariadb.yaml
+++ b/overrides/compose.mariadb.yaml
@@ -13,6 +13,7 @@ services:
       test: mysqladmin ping -h localhost --password=${DB_PASSWORD}
       interval: 1s
       retries: 20
+    restart: unless-stopped
     command:
       - --character-set-server=utf8mb4
       - --collation-server=utf8mb4_unicode_ci
diff --git a/overrides/compose.redis.yaml b/overrides/compose.redis.yaml
index a1b9b1f6..407ad9e1 100644
--- a/overrides/compose.redis.yaml
+++ b/overrides/compose.redis.yaml
@@ -9,9 +9,11 @@ services:
 
   redis-cache:
     image: redis:6.2-alpine
+    restart: unless-stopped
 
   redis-queue:
     image: redis:6.2-alpine
+    restart: unless-stopped
     volumes:
       - redis-queue-data:/data