diff --git a/roles/docker/templates/appriseapi-compose.yml.j2 b/roles/docker/templates/appriseapi-compose.yml.j2
index f3020b4..ffee161 100644
--- a/roles/docker/templates/appriseapi-compose.yml.j2
+++ b/roles/docker/templates/appriseapi-compose.yml.j2
@@ -1,6 +1,7 @@
 services:
   apprise:
     container_name: apprise
+    restart: unless-stopped
     ports:
       - {{ network.docker_host_ip }}:8000:8000
     environment:
diff --git a/roles/docker/templates/audiobookshelf-compose.yml.j2 b/roles/docker/templates/audiobookshelf-compose.yml.j2
index 29e4311..ce1f5f0 100644
--- a/roles/docker/templates/audiobookshelf-compose.yml.j2
+++ b/roles/docker/templates/audiobookshelf-compose.yml.j2
@@ -1,6 +1,7 @@
 services:
   audiobookshelf:
     image: ghcr.io/advplyr/audiobookshelf:latest
+    restart: unless-stopped
     volumes:
       - audiobooks:/audiobooks
       - podcasts:/podcasts
diff --git a/roles/docker/templates/dawarich-compose.yml.j2 b/roles/docker/templates/dawarich-compose.yml.j2
index c0097c4..d380ffe 100644
--- a/roles/docker/templates/dawarich-compose.yml.j2
+++ b/roles/docker/templates/dawarich-compose.yml.j2
@@ -52,7 +52,7 @@ services:
     tty: true
     entrypoint: web-entrypoint.sh
     command: ['bin/rails', 'server', '-p', '3000', '-b', '::']
-    restart: on-failure
+    restart: unless-stopped
     environment:
       RAILS_ENV: production
       DATABASE_HOST: dawarich_db
@@ -111,7 +111,7 @@ services:
     tty: true
     entrypoint: sidekiq-entrypoint.sh
     command: ['sidekiq']
-    restart: on-failure
+    restart: unless-stopped
     environment:
       RAILS_ENV: production
       DATABASE_HOST: dawarich_db