diff --git a/group_vars/all b/group_vars/all
index 6f5fe3ef..c4a2de50 100644
--- a/group_vars/all
+++ b/group_vars/all
@@ -146,6 +146,7 @@ domains_wordpress:              ["wordpress.{{top_domain}}","blog.{{top_domain}}
 postgres_default_version:       "16"
 
 ### Docker Role Specific Parameters
+docker_restart_policy:        "unless-stopped"
 
 #### Akaunting
 version_akaunting:            "latest"
diff --git a/roles/docker-akaunting/templates/docker-compose.yml.j2 b/roles/docker-akaunting/templates/docker-compose.yml.j2
index 3afc07e0..75766b28 100644
--- a/roles/docker-akaunting/templates/docker-compose.yml.j2
+++ b/roles/docker-akaunting/templates/docker-compose.yml.j2
@@ -12,7 +12,7 @@ services:
       - 127.0.0.1:{{http_port}}:80
     volumes:
       - data:/var/www/html
-    restart: unless-stopped
+    restart: {{docker_restart_policy}}
     env_file:
       - env/run.env
     environment:
diff --git a/roles/docker-baserow/templates/docker-compose.yml.j2 b/roles/docker-baserow/templates/docker-compose.yml.j2
index 32a258d3..9abc7d05 100644
--- a/roles/docker-baserow/templates/docker-compose.yml.j2
+++ b/roles/docker-baserow/templates/docker-compose.yml.j2
@@ -9,7 +9,7 @@ services:
   application:
     image: baserow/baserow:1.19.1
     container_name: baserow-application
-    restart: always
+    restart: {{docker_restart_policy}}
     logging:
       driver: journald
     env_file:
diff --git a/roles/docker-funkwhale/templates/docker-compose.yml.j2 b/roles/docker-funkwhale/templates/docker-compose.yml.j2
index e0996d77..b675230f 100644
--- a/roles/docker-funkwhale/templates/docker-compose.yml.j2
+++ b/roles/docker-funkwhale/templates/docker-compose.yml.j2
@@ -5,7 +5,7 @@ services:
 {% include 'templates/docker-service-redis.yml.j2' %}
 
   celeryworker:
-    restart: always
+    restart: {{docker_restart_policy}}
     image: funkwhale/api:${FUNKWHALE_VERSION:-latest}
     env_file: .env
     command: celery -A funkwhale_api.taskapp worker -l INFO --concurrency=${CELERYD_CONCURRENCY-0}
@@ -18,7 +18,7 @@ services:
 
 
   celerybeat:
-    restart: always
+    restart: {{docker_restart_policy}}
     image: funkwhale/api:${FUNKWHALE_VERSION:-latest}
     env_file: .env
     command: celery -A funkwhale_api.taskapp beat --pidfile= -l INFO
@@ -26,7 +26,7 @@ services:
 {% include 'templates/docker-container-networks.yml.j2' %}
 
   api:
-    restart: always
+    restart: {{docker_restart_policy}}
     image: funkwhale/api:${FUNKWHALE_VERSION:-latest}
     depends_on:
     env_file: .env
@@ -39,7 +39,7 @@ services:
 {% include 'templates/docker-container-networks.yml.j2' %}
 
   front:
-    restart: always
+    restart: {{docker_restart_policy}}
     image: funkwhale/front:${FUNKWHALE_VERSION:-latest}
     depends_on:
       - api
diff --git a/roles/docker-gitea/templates/docker-compose.yml.j2 b/roles/docker-gitea/templates/docker-compose.yml.j2
index 0d05c2dc..5d5e5be9 100644
--- a/roles/docker-gitea/templates/docker-compose.yml.j2
+++ b/roles/docker-gitea/templates/docker-compose.yml.j2
@@ -7,7 +7,7 @@ services:
   application:
     logging:
       driver: journald
-    restart: always
+    restart: {{docker_restart_policy}}
     image: gitea/gitea:latest
     environment:
       - USER_UID=1000
diff --git a/roles/docker-gitlab/templates/docker-compose.yml.j2 b/roles/docker-gitlab/templates/docker-compose.yml.j2
index b9f177a2..4db4d126 100644
--- a/roles/docker-gitlab/templates/docker-compose.yml.j2
+++ b/roles/docker-gitlab/templates/docker-compose.yml.j2
@@ -7,7 +7,7 @@ services:
 
   web:
     image: 'gitlab/gitlab-ee:latest'
-    restart: always
+    restart: {{docker_restart_policy}}
     hostname: '{{domain}}'
     environment:
       GITLAB_OMNIBUS_CONFIG: |
diff --git a/roles/docker-jenkins/tasks/main.yml b/roles/docker-jenkins/tasks/main.yml
index f38e8a0d..10d7ba1d 100644
--- a/roles/docker-jenkins/tasks/main.yml
+++ b/roles/docker-jenkins/tasks/main.yml
@@ -7,10 +7,9 @@
     definition:
       application:
         image: jenkins/jenkins:lts
-        restart: always
+        restart: "{{docker_restart_policy}}"
         ports:
           - "127.0.0.1:{{http_port}}:8080"
-        restart: always
         volumes:
           - jenkins_data:/var/jenkins_home
         log_driver: journald
diff --git a/roles/docker-joomla/templates/docker-compose.yml.j2 b/roles/docker-joomla/templates/docker-compose.yml.j2
index 0dc88ec0..2e9ae0f9 100644
--- a/roles/docker-joomla/templates/docker-compose.yml.j2
+++ b/roles/docker-joomla/templates/docker-compose.yml.j2
@@ -13,7 +13,7 @@ services:
       JOOMLA_DB_USER: "{{database_username}}"
       JOOMLA_DB_PASSWORD: "{{database_password}}"
       JOOMLA_DB_NAME: "{{database_name}}"
-    restart: always
+    restart: {{docker_restart_policy}}
     volumes:
       - data:/var/www/html
     ports:
diff --git a/roles/docker-listmonk/templates/docker-compose.yml.j2 b/roles/docker-listmonk/templates/docker-compose.yml.j2
index 173bad4d..dcff2737 100644
--- a/roles/docker-listmonk/templates/docker-compose.yml.j2
+++ b/roles/docker-listmonk/templates/docker-compose.yml.j2
@@ -5,7 +5,7 @@ services:
 {% include 'templates/docker-service-' + database_type + '.yml.j2' %}
 
   application:
-    restart: unless-stopped
+    restart: {{docker_restart_policy}}
     image: listmonk/listmonk:latest
     ports:
       - "127.0.0.1:{{http_port}}:9000"
diff --git a/roles/docker-mailu/templates/docker-compose.yml.j2 b/roles/docker-mailu/templates/docker-compose.yml.j2
index 0cf837d2..97c7b2ec 100644
--- a/roles/docker-mailu/templates/docker-compose.yml.j2
+++ b/roles/docker-mailu/templates/docker-compose.yml.j2
@@ -10,7 +10,7 @@ services:
   resolver:
     image: ghcr.io/mailu/unbound:{{version_mailu}}
     env_file: mailu.env
-    restart: always
+    restart: {{docker_restart_policy}}
 {% include 'templates/docker-container-networks.yml.j2' %}
         ipv4_address: 192.168.203.254
     logging:
@@ -18,7 +18,7 @@ services:
 
   front:
     image: ghcr.io/mailu/nginx:{{version_mailu}}
-    restart: always
+    restart: {{docker_restart_policy}}
     env_file: mailu.env
     logging:
       driver: journald
@@ -45,7 +45,7 @@ services:
       
   admin:
     image: ghcr.io/mailu/admin:{{version_mailu}}
-    restart: always
+    restart: {{docker_restart_policy}}
     env_file: mailu.env
     volumes:
       - "admin_data:/data"
@@ -63,7 +63,7 @@ services:
 
   imap:
     image: ghcr.io/mailu/dovecot:{{version_mailu}}
-    restart: always
+    restart: {{docker_restart_policy}}
     env_file: mailu.env
     volumes:
       - "dovecot_mail:/mail"
@@ -79,7 +79,7 @@ services:
 
   smtp:
     image: ghcr.io/mailu/postfix:{{version_mailu}}
-    restart: always
+    restart: {{docker_restart_policy}}
     env_file: mailu.env
     volumes:
       - "/etc/mailu/overrides:/overrides:ro"
@@ -96,7 +96,7 @@ services:
   oletools:
     image: ghcr.io/mailu/oletools:{{version_mailu}}
     hostname: oletools
-    restart: always
+    restart: {{docker_restart_policy}}
     depends_on:
       - resolver
     dns:
@@ -106,7 +106,7 @@ services:
 
   antispam:
     image: ghcr.io/mailu/rspamd:{{version_mailu}}
-    restart: always
+    restart: {{docker_restart_policy}}
     env_file: mailu.env
     volumes:
       - "filter:/var/lib/rspamd"
@@ -128,7 +128,7 @@ services:
   # Optional services
   antivirus:
     image: ghcr.io/mailu/clamav:{{version_mailu}}
-    restart: always
+    restart: {{docker_restart_policy}}
     env_file: mailu.env
     volumes:
       - "filter:/data"
@@ -142,7 +142,7 @@ services:
 
   webdav:
     image: ghcr.io/mailu/radicale:{{version_mailu}}
-    restart: always
+    restart: {{docker_restart_policy}}
     env_file: mailu.env
     volumes:
       - "webdav_data:/data"
@@ -159,7 +159,7 @@ services:
     image: ghcr.io/mailu/fetchmail:{{version_mailu}}
     volumes:
       - "admin_data:/data"
-    restart: always
+    restart: {{docker_restart_policy}}
     env_file: mailu.env
     logging:
       driver: journald
@@ -174,7 +174,7 @@ services:
 
   webmail:
     image: ghcr.io/mailu/webmail:{{version_mailu}}
-    restart: always
+    restart: {{docker_restart_policy}}
     env_file: mailu.env
     volumes:
       - "webmail_data:/data"
diff --git a/roles/docker-mariadb/tasks/main.yml b/roles/docker-mariadb/tasks/main.yml
index c07971cb..5d0cad18 100644
--- a/roles/docker-mariadb/tasks/main.yml
+++ b/roles/docker-mariadb/tasks/main.yml
@@ -24,7 +24,7 @@
     published_ports:
       - "127.0.0.1:3306:3306" # can be that this will be removed if all applications use sockets
     command: "--transaction-isolation=READ-COMMITTED --binlog-format=ROW" #for nextcloud
-    restart_policy: unless-stopped
+    restart_policy: "{{docker_restart_policy}}"
     healthcheck:
       test: "/usr/bin/mariadb --user=root --password={{central_mariadb_root_password}} --execute \"SHOW DATABASES;\""
       interval: 3s
diff --git a/roles/docker-mastodon/templates/docker-compose.yml.j2 b/roles/docker-mastodon/templates/docker-compose.yml.j2
index 7546657a..0db5fda7 100644
--- a/roles/docker-mastodon/templates/docker-compose.yml.j2
+++ b/roles/docker-mastodon/templates/docker-compose.yml.j2
@@ -7,7 +7,7 @@ services:
 
   web:
     image: ghcr.io/mastodon/mastodon:{{version_mastodon}}
-    restart: always
+    restart: {{docker_restart_policy}}
     env_file: .env.production
     command: bash -c "rm -f /mastodon/tmp/pids/server.pid; bundle exec rails s -p 3000"
     healthcheck:
@@ -23,7 +23,7 @@ services:
 
   streaming:
     image: ghcr.io/mastodon/mastodon:{{version_mastodon}}
-    restart: always
+    restart: {{docker_restart_policy}}
     env_file: .env.production
     command: node ./streaming
     healthcheck:
@@ -37,7 +37,7 @@ services:
 
   sidekiq:
     image: ghcr.io/mastodon/mastodon:{{version_mastodon}}
-    restart: always
+    restart: {{docker_restart_policy}}
     env_file: .env.production
     command: bundle exec sidekiq
 {% include 'templates/docker-container-depends-on-database-redis.yml.j2' %}
diff --git a/roles/docker-matomo/templates/docker-compose.yml.j2 b/roles/docker-matomo/templates/docker-compose.yml.j2
index 84bb0044..b62a294b 100644
--- a/roles/docker-matomo/templates/docker-compose.yml.j2
+++ b/roles/docker-matomo/templates/docker-compose.yml.j2
@@ -8,7 +8,7 @@ services:
     logging:
       driver: journald
     image: matomo
-    restart: always
+    restart: {{docker_restart_policy}}
     ports:
       - "127.0.0.1:{{http_port}}:80"
     environment:
diff --git a/roles/docker-matrix-compose/templates/docker-compose.yml.j2 b/roles/docker-matrix-compose/templates/docker-compose.yml.j2
index 58b4f210..8e0b9d88 100644
--- a/roles/docker-matrix-compose/templates/docker-compose.yml.j2
+++ b/roles/docker-matrix-compose/templates/docker-compose.yml.j2
@@ -6,7 +6,7 @@ services:
 
   synapse:
     image: matrixdotorg/synapse:latest
-    restart: always
+    restart: {{docker_restart_policy}}
     logging:
       driver: journald
     volumes:
@@ -23,7 +23,7 @@ services:
   
   element:
     image: vectorim/element-web:latest
-    restart: unless-stopped
+    restart: {{docker_restart_policy}}
     volumes:
       - ./element-config.json:/app/config.json
     ports:
@@ -34,28 +34,28 @@ services:
   #mautrix-telegram:
   #  container_name: mautrix-telegram
   #  image: dock.mau.dev/mautrix/telegram:<version>
-  #  restart: unless-stopped
+  #  restart: {{docker_restart_policy}}
   #  volumes:
   #  - telegram_bridge_data:/data
 
   #mautrix-whatsapp:
   #  container_name: mautrix-whatsapp
   #  image: dock.mau.dev/mautrix/whatsapp:latest
-  #  restart: unless-stopped
+  #  restart: {{docker_restart_policy}}
   #  volumes:
   #  - ./mautrix_whatsapp:/data
 
   #mautrix-facebook:
   #  container_name: mautrix-facebook
   #  image: dock.mau.dev/mautrix/facebook:<version>
-  #  restart: unless-stopped
+  #  restart: {{docker_restart_policy}}
   #  volumes:
   #  - facebook_bridge_data:/data
 
   #mautrix-instagram:
   #  container_name: mautrix-instagram
   #  image: dock.mau.dev/mautrix/instagram:<version>
-  #  restart: unless-stopped
+  #  restart: {{docker_restart_policy}}
   #  volumes:
   #  - instagram_bridge_data:/data  
 
diff --git a/roles/docker-mediawiki/tasks/main.yml b/roles/docker-mediawiki/tasks/main.yml
index 2f82b65c..d6be0213 100644
--- a/roles/docker-mediawiki/tasks/main.yml
+++ b/roles/docker-mediawiki/tasks/main.yml
@@ -8,7 +8,7 @@
       application:
         log_driver: journald
         image: mediawiki
-        restart: always
+        restart: "{{docker_restart_policy}}"
         depends_on:
           - database
         volumes:
@@ -26,4 +26,4 @@
           MARIADB_AUTO_UPGRADE: "1"
         volumes:
           - database:/var/lib/mysql
-        restart: always
+        restart: "{{docker_restart_policy}}"
diff --git a/roles/docker-mybb/templates/docker-compose.yml.j2 b/roles/docker-mybb/templates/docker-compose.yml.j2
index 7148bbae..32bb5837 100644
--- a/roles/docker-mybb/templates/docker-compose.yml.j2
+++ b/roles/docker-mybb/templates/docker-compose.yml.j2
@@ -9,7 +9,7 @@ services:
       options:
         tag: "mybb_application"
     image: mybb/mybb:latest
-    restart: always
+    restart: {{docker_restart_policy}}
     volumes:
       - data:/var/www/html
 {% include 'templates/docker-container-depends-on-just-database.yml.j2' %}
@@ -21,7 +21,7 @@ services:
       options:
         tag: "mybb_server"
     image: nginx:mainline
-    restart: always
+    restart: {{docker_restart_policy}}
     ports:
       - "127.0.0.1:{{http_port}}:80"
     volumes:
diff --git a/roles/docker-nextcloud/templates/docker-compose.yml.j2 b/roles/docker-nextcloud/templates/docker-compose.yml.j2
index 6d0ca075..e2d527e1 100644
--- a/roles/docker-nextcloud/templates/docker-compose.yml.j2
+++ b/roles/docker-nextcloud/templates/docker-compose.yml.j2
@@ -8,7 +8,7 @@ services:
 
   application:
     image: "nextcloud:{{version_nextcloud}}-fpm-alpine"
-    restart: always
+    restart: {{docker_restart_policy}}
     logging:
       driver: journald
     volumes:
@@ -25,7 +25,7 @@ services:
     image: nginx:alpine
     logging:
       driver: journald
-    restart: always
+    restart: {{docker_restart_policy}}
     ports:
       - "127.0.0.1:{{http_port}}:80"
     volumes:
@@ -41,7 +41,7 @@ services:
 
   cron:
     image: "nextcloud:{{version_nextcloud}}-fpm-alpine"
-    restart: always
+    restart: {{docker_restart_policy}}
     logging:
       driver: journald
     volumes:
diff --git a/roles/docker-openproject/templates/docker-compose.yml.j2 b/roles/docker-openproject/templates/docker-compose.yml.j2
index 38940177..6f533e66 100644
--- a/roles/docker-openproject/templates/docker-compose.yml.j2
+++ b/roles/docker-openproject/templates/docker-compose.yml.j2
@@ -1,7 +1,7 @@
 version: "3.7"
   
 x-op-app: &app
-  restart: unless-stopped
+  restart: {{docker_restart_policy}}
   image: openproject/community:${TAG:-13}
   environment:
     OPENPROJECT_HTTPS: "${OPENPROJECT_HTTPS}"
@@ -25,11 +25,11 @@ services:
 
   cache:
     image: memcached
-    restart: unless-stopped
+    restart: {{docker_restart_policy}}
 {% include 'templates/docker-container-networks.yml.j2' %}
 
   proxy:
-    restart: unless-stopped
+    restart: {{docker_restart_policy}}
     image: openproject/community:${TAG:-13}
     command: "./docker/prod/proxy"
     ports:
diff --git a/roles/docker-pixelfed/templates/docker-compose.yml.j2 b/roles/docker-pixelfed/templates/docker-compose.yml.j2
index 7a94f304..5442dba6 100644
--- a/roles/docker-pixelfed/templates/docker-compose.yml.j2
+++ b/roles/docker-pixelfed/templates/docker-compose.yml.j2
@@ -8,7 +8,7 @@ services:
 
   application:
     image: zknt/pixelfed
-    restart: always
+    restart: {{docker_restart_policy}}
     logging:
       driver: journald
     env_file:
@@ -23,7 +23,7 @@ services:
 {% include 'templates/docker-container-networks.yml.j2' %}
   worker:
     image: zknt/pixelfed
-    restart: always
+    restart: {{docker_restart_policy}}
     logging:
       driver: journald
     env_file:
diff --git a/roles/docker-postgres/tasks/main.yml b/roles/docker-postgres/tasks/main.yml
index 69b8fa29..fc3f9334 100644
--- a/roles/docker-postgres/tasks/main.yml
+++ b/roles/docker-postgres/tasks/main.yml
@@ -18,7 +18,7 @@
       - "127.0.0.1:5432:5432"
     volumes:
       - central_postgres_database:/var/lib/postgresql/data
-    restart_policy: unless-stopped
+    restart_policy: "{{docker_restart_policy}}"
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -U postgres"]
       interval: 10s
diff --git a/roles/docker-roulette-wheel/templates/docker-compose.yml.j2 b/roles/docker-roulette-wheel/templates/docker-compose.yml.j2
index 0af8da9a..418615f1 100644
--- a/roles/docker-roulette-wheel/templates/docker-compose.yml.j2
+++ b/roles/docker-roulette-wheel/templates/docker-compose.yml.j2
@@ -6,4 +6,4 @@ services:
             context: .
         ports:
         - 127.0.0.1:{{http_port}}:8080
-        restart: always
\ No newline at end of file
+        restart: {{docker_restart_policy}}
\ No newline at end of file
diff --git a/roles/docker-wordpress/templates/docker-compose.yml.j2 b/roles/docker-wordpress/templates/docker-compose.yml.j2
index 8103b187..b78e8eb7 100644
--- a/roles/docker-wordpress/templates/docker-compose.yml.j2
+++ b/roles/docker-wordpress/templates/docker-compose.yml.j2
@@ -10,7 +10,7 @@ services:
     image: custom_wordpress
     build:
       context: .
-    restart: always
+    restart: {{docker_restart_policy}}
     ports:
       - "127.0.0.1:{{http_port}}:80"
     environment:
diff --git a/roles/docker-yourls/templates/docker-compose.yml.j2 b/roles/docker-yourls/templates/docker-compose.yml.j2
index 16b31103..0e76766d 100644
--- a/roles/docker-yourls/templates/docker-compose.yml.j2
+++ b/roles/docker-yourls/templates/docker-compose.yml.j2
@@ -8,7 +8,7 @@ services:
     logging:
       driver: journald
     image: yourls
-    restart: always
+    restart: {{docker_restart_policy}}
     ports:
       - "127.0.0.1:{{http_port}}:80"
     environment:
diff --git a/templates/docker-service-mariadb.yml.j2 b/templates/docker-service-mariadb.yml.j2
index 9043d29a..a3df665c 100644
--- a/templates/docker-service-mariadb.yml.j2
+++ b/templates/docker-service-mariadb.yml.j2
@@ -5,7 +5,7 @@
     logging:
       driver: journald
     image: mariadb
-    restart: always
+    restart: {{docker_restart_policy}}
     environment:
       MYSQL_DATABASE: "{{database_name}}"
       MYSQL_USER: "{{database_username}}"
diff --git a/templates/docker-service-postgres.yml.j2 b/templates/docker-service-postgres.yml.j2
index 07066a0a..b0bf7260 100644
--- a/templates/docker-service-postgres.yml.j2
+++ b/templates/docker-service-postgres.yml.j2
@@ -8,7 +8,7 @@
       - POSTGRES_USER={{database_username}}
       - POSTGRES_DB={{database_name}}
       - POSTGRES_INITDB_ARGS=--encoding=UTF8 --locale=C
-    restart: always
+    restart: {{docker_restart_policy}}
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -U {{database_name}}"]
       interval: 10s
diff --git a/templates/docker-service-redis.yml.j2 b/templates/docker-service-redis.yml.j2
index 6f951f51..8f4bfeb4 100644
--- a/templates/docker-service-redis.yml.j2
+++ b/templates/docker-service-redis.yml.j2
@@ -2,7 +2,7 @@
   redis:
     image: redis:alpine
     container_name: {{docker_compose_project_name}}-redis
-    restart: always
+    restart: {{docker_restart_policy}}
     logging:
       driver: journald
     volumes: