diff --git a/docker-stack.yml b/docker-stack.yml
index af87bce..a63e289 100644
--- a/docker-stack.yml
+++ b/docker-stack.yml
@@ -99,6 +99,8 @@ services:
         - "traefik.http.services.ocis.loadbalancer.server.port=9200"
       restart_policy:
         condition: on-failure
+        delay: 5s
+        max_attempts: 3
 
   ocis-appprovider-collabora:
     image: owncloud/ocis:${OCIS_DOCKER_TAG:-latest}
@@ -127,7 +129,11 @@ services:
       - ocis-config:/etc/ocis
     logging:
       driver: "local"
-    restart: always
+    deploy: 
+      restart_policy:
+        condition: on-failure
+        delay: 5s
+        max_attempts: 3
 
   ocis-appprovider-onlyoffice:
     image: owncloud/ocis:${OCIS_DOCKER_TAG:-latest}
@@ -163,7 +169,11 @@ services:
       - ocis-config:/etc/ocis
     logging:
       driver: "local"
-    restart: always
+    deploy: 
+      restart_policy:
+        condition: on-failure
+        delay: 5s
+        max_attempts: 3
 
   wopiserver:
     image: cs3org/wopiserver:${WOPISERVER_DOCKER_TAG:-v10.2.2}
@@ -189,7 +199,11 @@ services:
       - "traefik.http.services.wopiserver.loadbalancer.server.port=8880"
     logging:
       driver: "local"
-    restart: always
+    deploy: 
+      restart_policy:
+        condition: on-failure
+        delay: 5s
+        max_attempts: 3
 
   collabora:
     image: collabora/code:23.05.5.2.1
@@ -212,7 +226,11 @@ services:
       - "traefik.http.services.collabora.loadbalancer.server.port=9980"
     logging:
       driver: "local"
-    restart: always
+    deploy: 
+      restart_policy:
+        condition: on-failure
+        delay: 5s
+        max_attempts: 3
 
   onlyoffice:
     image: onlyoffice/documentserver:7.5.0
@@ -239,13 +257,16 @@ services:
       - "traefik.http.routers.onlyoffice.middlewares=onlyoffice"
     logging:
       driver: "local"
-    restart: always
+    deploy: 
+      restart_policy:
+        condition: on-failure
+        delay: 5s
+        max_attempts: 3
 
   tika:
     image: ${TIKA_IMAGE:-apache/tika:latest-full}
     networks:
       - ocis-net
-    restart: always
 
   inbucket:
     image: inbucket/inbucket
@@ -268,7 +289,11 @@ services:
       - "traefik.http.services.inbucket.loadbalancer.server.port=9000"
     logging:
       driver: "local"
-    restart: always
+    deploy: 
+      restart_policy:
+        condition: on-failure
+        delay: 5s
+        max_attempts: 3
 
 
 networks: