diff --git a/docker-compose.yml b/docker-compose.yml
index db065fc28e1720cdd181c8552bc14703f4353a38..5a575fc10d64d39c3147962a120b90c50076ab30 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,7 +7,7 @@ services:
   duniter-v2s:
     container_name: duniter-v2s
     # choose the version of the image here
-    image: duniter/duniter-v2s:v0.4.0
+    image: duniter/duniter-v2s:latest
     ports:
       # telemetry
       - 9615:9615
@@ -19,8 +19,7 @@ services:
       - 30333:30333
     environment:
       DUNITER_NODE_NAME: "duniter_local"
-      DUNITER_CHAIN_NAME: "dev"
-      #DUNITER_DISABLE_PROMETHEUS: "false"
+      DUNITER_CHAIN_NAME: "gdev"
     volumes:
       - duniter-local-data:/var/lib/duniter
 
diff --git a/docker/compose/gdev-mirror.docker-compose.yml b/docker/compose/gdev-mirror.docker-compose.yml
index a0643580d0f1bf0bfd649d7679820833169c8562..039ab56b7d51fe7513101ada257a7c65b42ba2a9 100644
--- a/docker/compose/gdev-mirror.docker-compose.yml
+++ b/docker/compose/gdev-mirror.docker-compose.yml
@@ -4,7 +4,7 @@ version: "3.5"
 
 services:
   duniter-rpc:
-    image: duniter/duniter-v2s:v0.4.0
+    image: duniter/duniter-v2s:latest
     restart: unless-stopped
     ports:
       # telemetry
@@ -20,14 +20,8 @@ services:
       - duniter-rpc-data:/var/lib/duniter/
     environment:
       - DUNITER_CHAIN_NAME=gdev
-    command:
-      - "--node-key-file"
-      - "/var/lib/duniter/node.key"
-      - "--public-addr"
       # SERVER_DOMAIN should be replaced by a domain name that point on your server
-      - "/dns/${SERVER_DOMAIN?SERVER_DOMAIN should be set}/tcp/30333/ws"
-      - "--rpc-cors"
-      - "all"
+      - DUNITER_PUBLIC_ADDR=/dns/${SERVER_DOMAIN?SERVER_DOMAIN should be set}/tcp/30333/ws
 
 volumes:
   duniter-rpc-data:
diff --git a/docker/compose/gdev-validator.docker-compose.yml b/docker/compose/gdev-validator.docker-compose.yml
index 58961ae6fabb6d440ac6de0aac98e043e0e7491f..655dd1a209be43b04b7fe132bb2df10a00b517ae 100644
--- a/docker/compose/gdev-validator.docker-compose.yml
+++ b/docker/compose/gdev-validator.docker-compose.yml
@@ -2,7 +2,7 @@ version: "3.5"
 
 services:
   duniter-rpc:
-    image: duniter/duniter-v2s:v0.4.0
+    image: duniter/duniter-v2s:latest
     restart: unless-stopped
     ports:
       # telemetry
@@ -18,15 +18,11 @@ services:
       - duniter-rpc-data:/var/lib/duniter/
     environment:
       - DUNITER_CHAIN_NAME=gdev
-    command:
-      - "--node-key-file=/var/lib/duniter/node.key"
-      - "--public-addr"
-      # SERVER_DOMAIN should be replaced by a domain name that point on your server
-      - "/dns/${SERVER_DOMAIN?SERVER_DOMAIN should be set}/tcp/30333/ws"
-      - "--rpc-cors=all"
+      # RPC_SERVER_DOMAIN should be replaced by a domain name that point on your server
+      - DUNITER_PUBLIC_ADDR=/dns/${RPC_SERVER_DOMAIN?RPC_SERVER_DOMAIN should be set}/tcp/30333/ws
 
   duniter-validator:
-    image: duniter/duniter-v2s:v0.4.0
+    image: duniter/duniter-v2s:latest
     restart: unless-stopped
     ports:
       # telemetry
@@ -42,12 +38,8 @@ services:
       - duniter-validator-data:/var/lib/duniter/
     environment:
       - DUNITER_CHAIN_NAME=gdev
+      # VALIDATOR_SERVER_DOMAIN should be replaced by a domain name that point on your server
+      - DUNITER_PUBLIC_ADDR=/dns/${VALIDATOR_SERVER_DOMAIN?VALIDATOR_SERVER_DOMAIN should be set}/tcp/30333
+      - DUNITER_VALIDATOR=true
     command:
-      - "--node-key-file=/var/lib/duniter/node.key"
-      - "--public-addr"
-      # SERVER_DOMAIN should be replaced by a domain name that point on your server
-      - "/dns/${SERVER_DOMAIN?SERVER_DOMAIN should be set}/tcp/30333"
-      - "--rpc-cors=all"
-      - "--rpc-methods=Unsafe"
-      - "--validator"
       - "--pruning=14400"
diff --git a/docker/compose/live-template.docker-compose.yml b/docker/compose/live-template.docker-compose.yml
index 93564f0ea487c059274e4288ae5fe1d1a9a5eb97..643ae8c4ea970ba5a13a9a4e4cc1b3d8cf80e9f8 100644
--- a/docker/compose/live-template.docker-compose.yml
+++ b/docker/compose/live-template.docker-compose.yml
@@ -14,10 +14,6 @@ services:
     command:
       - "--bootnodes"
       - "/dns/duniter-validator/tcp/30333/p2p/VALIDATOR_NODE_KEY"
-      - "--node-key-file"
-      - "/var/lib/duniter/node-key"
-      - "--rpc-cors"
-      - "all"
 
   duniter-validator:
     image: duniter/duniter-v2s:DUNITER_IMAGE_TAG
@@ -29,12 +25,7 @@ services:
       - ./duniter-validator/:/var/lib/duniter/
     environment:
       - DUNITER_CHAIN_NAME=/var/lib/duniter/CURRENCY-raw.json
+      - DUNITER_VALIDATOR=true
     command:
       - "--bootnodes"
       - "/dns/duniter-rpc/tcp/30333/p2p/RPC_NODE_KEY"
-      - "--node-key-file"
-      - "/var/lib/duniter/node-key"
-      - "--rpc-methods=Unsafe"
-      - "--validator"
-      - "--rpc-cors"
-      - "all"