diff --git a/templates/docker-compose.yml.j2 b/templates/docker-compose.yml.j2
index dc8c7ba..80ae659 100644
--- a/templates/docker-compose.yml.j2
+++ b/templates/docker-compose.yml.j2
@@ -3,7 +3,7 @@ version: '3.9'
 services:
   app:
     image: fireflyiii/core:latest
-    restart: always
+    restart: unless-stopped
     volumes:
       - firefly_iii_upload:/var/www/html/storage/upload
     env_file: env.firefly.conf
@@ -16,7 +16,7 @@ services:
   db:
     image: mariadb    
     hostname: fireflyiiidb
-    restart: always
+    restart: unless-stopped
     env_file: env.db.conf
     networks:
       - firefly_iii
@@ -29,6 +29,7 @@ services:
     # The STATIC_CRON_TOKEN must be *exactly* 32 characters long
     #
     image: alpine
+    restart: unless-stopped
     command: sh -c "echo \"0 3 * * * wget -qO- http://app:8080/api/v1/cron/{{ firefly_static_cron_token }}\" | crontab - && crond -f -L /dev/stdout"
     networks:
       - firefly_iii