diff --git a/dockers/mastodon/docker-compose.yml b/dockers/mastodon/docker-compose.yml
index cc13ba6..e683cd0 100644
--- a/dockers/mastodon/docker-compose.yml
+++ b/dockers/mastodon/docker-compose.yml
@@ -3,7 +3,8 @@
 
 services:
   db:
-    restart: always
+    container_name: ${mastodonDBName}
+    restart: ${restartPolicy}
     image: postgres:14-alpine
     shm_size: 256mb
     networks:
@@ -16,7 +17,8 @@ services:
       - 'POSTGRES_HOST_AUTH_METHOD=trust'
 
   redis:
-    restart: always
+    container_name: ${mastodonRedisName}
+    restart: ${restartPolicy}
     image: redis:7-alpine
     networks:
       - mastodonNet
@@ -59,8 +61,9 @@ services:
   web:
     # You can uncomment the following line if you want to not use the prebuilt image, for example if you have local code changes
     # build: .
+    container_name: ${mastodonServName}
     image: ghcr.io/mastodon/mastodon:v4.3.6
-    restart: always
+    restart: ${restartPolicy}
     env_file:
       - env-config
       - ../../secret/env-mastodonServ
@@ -80,7 +83,7 @@ services:
       - public_system:/mastodon/public/system
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.koz.rule=Host(`koz.kaz.bzh`)"
+      - "traefik.http.routers.koz.rule=Host(`${mastodonHost}.${domain}`)"
       - "traefik.http.services.koz.loadbalancer.server.port=3000"
       - "traefik.docker.network=mobilizonNet"
 
@@ -90,8 +93,9 @@ services:
     # build:
     #   dockerfile: ./streaming/Dockerfile
     #   context: .
+    container_name: ${mastodonStreamingName}
     image: ghcr.io/mastodon/mastodon-streaming:v4.3.6
-    restart: always
+    restart: ${restartPolicy}
     env_file:
       - env-config
       - ../../secret/env-mastodonServ
@@ -110,8 +114,9 @@ services:
   sidekiq:
     # You can uncomment the following line if you want to not use the prebuilt image, for example if you have local code changes
     # build: .
+    container_name: ${mastodonSidekiqName}
     image: ghcr.io/mastodon/mastodon:v4.3.6
-    restart: always
+    restart: ${restartPolicy}
     env_file:
       - env-config
       - ../../secret/env-mastodonServ