diff --git a/docker/hub/docker-compose.postgres.yml b/docker/hub/docker-compose.postgres.yml
index f821a6781..863c99c32 100644
--- a/docker/hub/docker-compose.postgres.yml
+++ b/docker/hub/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:
     image: jonaswinkler/paperless-ng:latest
-    restart: always
+    restart: unless-stopped
     depends_on:
       - db
       - broker
diff --git a/docker/hub/docker-compose.sqlite.yml b/docker/hub/docker-compose.sqlite.yml
index cc26dc46c..2ab0cbb9c 100644
--- a/docker/hub/docker-compose.sqlite.yml
+++ b/docker/hub/docker-compose.sqlite.yml
@@ -2,11 +2,11 @@ version: "3.4"
 services:
   broker:
     image: redis:6.0
-    restart: always
+    restart: unless-stopped
 
   webserver:
     image: jonaswinkler/paperless-ng:latest
-    restart: always
+    restart: unless-stopped
     depends_on:
       - broker
     ports:
diff --git a/docker/hub/docker-compose.tika.yml b/docker/hub/docker-compose.tika.yml
index 7ad7685d3..f9e44472a 100644
--- a/docker/hub/docker-compose.tika.yml
+++ b/docker/hub/docker-compose.tika.yml
@@ -2,11 +2,11 @@ version: "3.4"
 services:
   broker:
     image: redis:6.0
-    restart: always
+    restart: unless-stopped
 
   webserver:
     image: jonaswinkler/paperless-ng:latest
-    restart: always
+    restart: unless-stopped
     depends_on:
       - broker
     ports: