diff --git a/docker-compose-mysql.yaml b/docker-compose-mysql.yaml
index 269cd72d..78f0cf1e 100644
--- a/docker-compose-mysql.yaml
+++ b/docker-compose-mysql.yaml
@@ -5,6 +5,7 @@ services:
     image: maxking/mailman-core:0.4 # Use a specific version tag (tag latest is not published)
     container_name: mailman-core
     hostname: mailman-core
+    restart: unless-stopped
     volumes:
     - /opt/mailman/core:/opt/mailman/
     stop_grace_period: 30s
@@ -26,6 +27,7 @@ services:
     image: maxking/mailman-web:0.4 # Use a specific version tag (tag latest is not published)
     container_name: mailman-web
     hostname: mailman-web
+    restart: unless-stopped
     depends_on:
     - database
     links:
diff --git a/docker-compose-postorius.yaml b/docker-compose-postorius.yaml
index 3bcfff7a..4e733cf0 100644
--- a/docker-compose-postorius.yaml
+++ b/docker-compose-postorius.yaml
@@ -5,6 +5,7 @@ services:
     image: maxking/mailman-core:0.4 # Use a specific version tag (tag latest is not published)
     container_name: mailman-core
     hostname: mailman-core
+    restart: unless-stopped
     volumes:
     - /opt/mailman/core:/opt/mailman/
     stop_grace_period: 30s
@@ -26,6 +27,7 @@ services:
     image: maxking/postorius:0.4 # Use a specific version tag (tag latest is not published)
     container_name: mailman-web
     hostname: mailman-web
+    restart: unless-stopped
     depends_on:
     - database
     links:
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 58d1d786..4d49da29 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -5,6 +5,7 @@ services:
     image: maxking/mailman-core:0.4 # Use a specific version tag (tag latest is not published)
     container_name: mailman-core
     hostname: mailman-core
+    restart: unless-stopped
     volumes:
     - /opt/mailman/core:/opt/mailman/
     stop_grace_period: 30s
@@ -27,6 +28,7 @@ services:
     image: maxking/mailman-web:0.4 # Use a specific version tag (tag latest is not published)
     container_name: mailman-web
     hostname: mailman-web
+    restart: unless-stopped
     depends_on:
     - database
     links: