diff --git a/pica-mail/docker-compose.yml b/pica-mail/docker-compose.yml
index 4150a2f975a8f57527fde47d4e485dc3ddb78b23..5327b8390edddfe0ba17b9f30892205bea175bfe 100644
--- a/pica-mail/docker-compose.yml
+++ b/pica-mail/docker-compose.yml
@@ -33,6 +33,7 @@ services:
       USER_FILTER: (uid=%n)
       PASSWORD_FILTER: (uid=%n)
     env_file: ./secrets/mail.secrets
+    restart: unless-stopped
 
   mail-mta:
     image: registry.picasoft.net/pica-mail-mta:v1.0.2
@@ -87,3 +88,4 @@ services:
       traefik.enable: true
       tls-certs-monitor.enable: true
       tls-certs-monitor.action: restart
+    restart: unless-stopped