diff --git a/templates/docker-compose.yml.twig b/templates/docker-compose.yml.twig
index eb3f443dc77bab510f1446b102a2d89a09fdf614..5c8fef1d346a17399f165224d63646ce576b1e3a 100644
--- a/templates/docker-compose.yml.twig
+++ b/templates/docker-compose.yml.twig
@@ -619,6 +619,7 @@ services:
 
   in-db:
     image: 'mysql:5'
+    restart: unless-stopped
     environment:
       - MYSQL_ROOT_PASSWORD=ninjaAdm1nPassword
       - MYSQL_USER=ninja
@@ -631,6 +632,7 @@ services:
   in-app:
     # After first startup, call "sudo chown -R 1500:1500 app" and start again.
     image: 'invoiceninja/invoiceninja:5'
+    restart: unless-stopped
     depends_on:
       - in-db
     environment:
@@ -666,6 +668,7 @@ services:
       - '{{ projectrootinvoiceninja }}/storage:/var/www/app/storage:rw,delegated'
   in-web:
     image: nginx
+    restart: unless-stopped
     networks:
       - traefik-public
       - default