diff --git a/roles/cloud/templates/docker-compose.yml.j2 b/roles/cloud/templates/docker-compose.yml.j2
index fc9637f..108878b 100644
--- a/roles/cloud/templates/docker-compose.yml.j2
+++ b/roles/cloud/templates/docker-compose.yml.j2
@@ -3,7 +3,7 @@ version: '3'
 services:
   db:
     image: postgres:14
-    restart: always
+    restart: unless-stopped
     container_name: nextcloud_db
     networks:
       - internal
@@ -16,7 +16,7 @@ services:
 
   nextcloud:
     image: nextcloud
-    restart: always
+    restart: unless-stopped
     container_name: nextcloud
     networks:
       - proxy
diff --git a/roles/dolibarr/templates/docker-compose.yml.j2 b/roles/dolibarr/templates/docker-compose.yml.j2
index a18acdb..857ab7a 100644
--- a/roles/dolibarr/templates/docker-compose.yml.j2
+++ b/roles/dolibarr/templates/docker-compose.yml.j2
@@ -13,7 +13,7 @@ services:
 
   dolibarr:
     image: tuxgasy/dolibarr:latest
-    restart: always
+    restart: unless-stopped
     container_name: dolibarr
     environment:
       DOLI_DB_HOST: mariadb
diff --git a/roles/home_assistant/templates/docker-compose.yml.j2 b/roles/home_assistant/templates/docker-compose.yml.j2
index 58f18c1..625b56e 100644
--- a/roles/home_assistant/templates/docker-compose.yml.j2
+++ b/roles/home_assistant/templates/docker-compose.yml.j2
@@ -3,7 +3,7 @@ version: '3'
 services:
   home_assistant:
     image: homeassistant/home-assistant
-    restart: always
+    restart: unless-stopped
     container_name: home_assistant
     environment:
       - TZ=Europe/Paris
diff --git a/roles/metrics/templates/docker-compose.yml b/roles/metrics/templates/docker-compose.yml
index 2fb9db9..7190103 100644
--- a/roles/metrics/templates/docker-compose.yml
+++ b/roles/metrics/templates/docker-compose.yml
@@ -33,6 +33,7 @@ services:
 
   loki:
     image: grafana/loki:latest
+    restart: unless-stopped
     command: -config.file=/etc/loki/config.yml
     volumes:
       - {{ server.work_dir }}/loki/config:/etc/loki
@@ -41,6 +42,7 @@ services:
 
   promtail:
     image: grafana/promtail:latest
+    restart: unless-stopped
     command: -config.file=/etc/promtail/config.yml
     volumes:
       - {{ server.work_dir }}/promtail/config:/etc/promtail
diff --git a/roles/n8n/templates/docker-compose.yml.j2 b/roles/n8n/templates/docker-compose.yml.j2
index 356651e..bddea37 100644
--- a/roles/n8n/templates/docker-compose.yml.j2
+++ b/roles/n8n/templates/docker-compose.yml.j2
@@ -3,7 +3,7 @@ version: '3'
 services:
   db:
     image: postgres:14
-    restart: always
+    restart: unless-stopped
     container_name: n8n_db
     networks:
       - internal
@@ -16,7 +16,7 @@ services:
 
   n8n:
     image: n8nio/n8n
-    restart: always
+    restart: unless-stopped
     container_name: n8n
     networks:
       - internal
diff --git a/roles/protonmail/templates/docker-compose.yml.j2 b/roles/protonmail/templates/docker-compose.yml.j2
index 319305b..2ca4c3b 100644
--- a/roles/protonmail/templates/docker-compose.yml.j2
+++ b/roles/protonmail/templates/docker-compose.yml.j2
@@ -3,7 +3,7 @@ version: '3'
 services: 
   protonmail-bridge:
     image: shenxn/protonmail-bridge
-    restart: always
+    restart: unless-stopped
     container_name: protonmail-bridge
     networks:
       - protonmail
diff --git a/roles/traefik/templates/config/traefik.yml b/roles/traefik/templates/config/traefik.yml
index b9d4fe9..413d450 100644
--- a/roles/traefik/templates/config/traefik.yml
+++ b/roles/traefik/templates/config/traefik.yml
@@ -2,13 +2,8 @@ api:
   dashboard: true
 
 log:
-  filePath: "/var/log/traefik/traefik.log"
-  format: json
   level: INFO
-
-accessLog:
-  filePath: "/var/log/traefik/access.log"
-  format: json
+accessLog: {}
 
 entryPoints:
   http:
diff --git a/roles/traefik/templates/docker-compose.yml b/roles/traefik/templates/docker-compose.yml
index 44897f1..86e14b4 100644
--- a/roles/traefik/templates/docker-compose.yml
+++ b/roles/traefik/templates/docker-compose.yml
@@ -20,8 +20,6 @@ services:
       - ./config/traefik.yml:/traefik.yml:ro
       - ./config/dynamic_conf.yml:/dynamic_conf.yml:ro
       - {{ server.work_dir }}/traefik/base/acme.json:/acme.json:rw
-      - {{ server.work_dir }}/traefik/base/access.log:/var/log/traefik/access.log:rw
-      - {{ server.work_dir }}/traefik/base/traefik.log:/var/log/traefik/traefik.log:rw
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
     extra_hosts:
diff --git a/roles/vaultwarden/templates/docker-compose.yml.j2 b/roles/vaultwarden/templates/docker-compose.yml.j2
index 0ce1784..cdfdf02 100644
--- a/roles/vaultwarden/templates/docker-compose.yml.j2
+++ b/roles/vaultwarden/templates/docker-compose.yml.j2
@@ -3,7 +3,7 @@ version: '3'
 services:
   db:
     image: postgres:15
-    restart: always
+    restart: unless-stopped
     container_name: db
     networks:
       - internal
@@ -14,7 +14,7 @@ services:
 
   vaultwarden:
     image: vaultwarden/server:latest
-    restart: always
+    restart: unless-stopped
     container_name: vaultwarden
     networks:
       - proxy
diff --git a/roles/watchtower/templates/docker-compose.yml.j2 b/roles/watchtower/templates/docker-compose.yml.j2
index f15dfd3..815be17 100644
--- a/roles/watchtower/templates/docker-compose.yml.j2
+++ b/roles/watchtower/templates/docker-compose.yml.j2
@@ -3,7 +3,7 @@ version: '3'
 services: 
   watchtower:
     image: containrrr/watchtower:latest
-    restart: always
+    restart: unless-stopped
     container_name: watchtower
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
diff --git a/roles/whoami/templates/docker-compose.yml.j2 b/roles/whoami/templates/docker-compose.yml.j2
index a57520c..d8099ff 100644
--- a/roles/whoami/templates/docker-compose.yml.j2
+++ b/roles/whoami/templates/docker-compose.yml.j2
@@ -3,7 +3,7 @@ version: '3'
 services: 
   whoami:
     image: "containous/whoami"
-    restart: always
+    restart: unless-stopped
     container_name: "whoami"
     networks:
       - proxy
diff --git a/roles/wireguard/templates/docker-compose.yml.j2 b/roles/wireguard/templates/docker-compose.yml.j2
index a60d660..9832017 100644
--- a/roles/wireguard/templates/docker-compose.yml.j2
+++ b/roles/wireguard/templates/docker-compose.yml.j2
@@ -3,7 +3,7 @@ version: '3'
 services:
   wireguard:
     image: lscr.io/linuxserver/wireguard:latest
-    restart: always
+    restart: unless-stopped
     container_name: wireguard
     cap_add:
       - NET_ADMIN
@@ -31,7 +31,7 @@ services:
 
   adguardhome:
     image: adguard/adguardhome:latest
-    restart: always
+    restart: unless-stopped
     container_name: adguardhome
     volumes:
       - {{ server.work_dir }}/adguardhome/work:/opt/adguardhome/work