diff --git a/docker-compose.postgres.yml b/docker-compose.postgres.yml
index 59ae28939..53fea9e28 100644
--- a/docker-compose.postgres.yml
+++ b/docker-compose.postgres.yml
@@ -2,11 +2,11 @@ version: "3.4"
 services:
   broker:
     image: redis:6.0
-    restart: always
+    restart: unless-stopped
 
   db:
     image: postgres:13
-    restart: always
+    restart: unless-stopped
     volumes:
       - pgdata:/var/lib/postgresql/data
     environment:
@@ -16,7 +16,7 @@ services:
 
   webserver:
     build: .
-    restart: always
+    restart: unless-stopped
     depends_on:
       - db
       - broker
diff --git a/docker-compose.sqlite.yml b/docker-compose.sqlite.yml
index 2d21fa3f1..87aa100a6 100644
--- a/docker-compose.sqlite.yml
+++ b/docker-compose.sqlite.yml
@@ -2,11 +2,11 @@ version: "3.4"
 services:
   broker:
     image: redis:6.0
-    restart: always
+    restart: unless-stopped
 
   webserver:
     build: .
-    restart: always
+    restart: unless-stopped
     depends_on:
       - broker
     ports:
diff --git a/docker-compose.tika.yml b/docker-compose.tika.yml
index 889713908..d7b7e0da9 100644
--- a/docker-compose.tika.yml
+++ b/docker-compose.tika.yml
@@ -2,11 +2,11 @@ version: "3.4"
 services:
   broker:
     image: redis:6.0
-    restart: always
+    restart: unless-stopped
 
   webserver:
     build: .
-    restart: always
+    restart: unless-stopped
     depends_on:
       - broker
     ports: