diff --git a/stack/duniter/v2s.mk b/stack/duniter/v2s.mk
index c16dc3c..8a16dfa 100644
--- a/stack/duniter/v2s.mk
+++ b/stack/duniter/v2s.mk
@@ -1,19 +1,21 @@
-ENV_VARS                                  += DUNITER_UI_SERVICE_80_TAGS DUNITER_UI_WS_URL DUNITER_V2S_DUNITER_CHAIN_NAME DUNITER_V2S_DUNITER_NODE_NAME DUNITER_V2S_DUNITER_PUBLIC_ADDR DUNITER_V2S_DUNITER_PRUNING_PROFILE DUNITER_V2S_SERVICE_9615_TAGS DUNITER_V2S_SERVICE_9933_TAGS DUNITER_V2S_SERVICE_9944_TAGS DUNITER_V2S_SERVICE_30333_TAGS
+ENV_VARS                                  += DUNITER_UI_SERVICE_80_TAGS DUNITER_UI_WS_URL DUNITER_V2S_DUNITER_CHAIN_NAME DUNITER_V2S_DUNITER_NODE_NAME DUNITER_V2S_DUNITER_PUBLIC_ADDR DUNITER_V2S_DUNITER_PUBLIC_RPC DUNITER_V2S_DUNITER_PRUNING_PROFILE DUNITER_V2S_SERVICE_9615_TAGS DUNITER_V2S_SERVICE_9933_TAGS DUNITER_V2S_SERVICE_9944_TAGS DUNITER_V2S_SERVICE_30333_TAGS
 DUNITER_UI_SERVICE_NAME                   ?= $(DUNITER_V2S_SERVICE_NAME)
 DUNITER_UI_SERVICE_80_PATH                ?= ui/
 DUNITER_UI_SERVICE_80_STRIP               ?= /ui
 DUNITER_UI_SERVICE_80_TAGS                ?= $(call tagprefix,DUNITER_UI,80)
-DUNITER_UI_WS_URL                         ?= wss://$(DUNITER_V2S_SERVICE_NAME).$(firstword $(APP_URIS))$(firstword $(DUNITER_V2S_SERVICE_9944_PATH))
+DUNITER_UI_WS_URL                         ?= $(DUNITER_V2S_DUNITER_PUBLIC_RPC)
 DUNITER_V2S_DUNITER_CHAIN_NAME            ?= gdev
-DUNITER_V2S_DUNITER_NODE_NAME             ?= $(USER)-$(ENV)-$(DUNITER_V2S_DUNITER_PRUNING_PROFILE)
-DUNITER_V2S_DUNITER_PUBLIC_ADDR           ?= /dns/$(DUNITER_V2S_SERVICE_NAME).$(firstword $(APP_HOST))/tcp/443/wss
+DUNITER_V2S_DUNITER_NODE_NAME             ?= $(USER)-$(DUNITER_V2S_DUNITER_CHAIN_NAME)-$(DUNITER_V2S_DUNITER_PRUNING_PROFILE)
+DUNITER_V2S_DUNITER_PUBLIC_ADDR           ?= /dns/$(DUNITER_V2S_SERVICE_HOST)/tcp/443/wss
 DUNITER_V2S_DUNITER_PRUNING_PROFILE       ?= default
+DUNITER_V2S_DUNITER_PUBLIC_RPC            ?= wss://$(DUNITER_V2S_SERVICE_HOST)/$(DUNITER_V2S_SERVICE_9944_PATH)
+DUNITER_V2S_SERVICE_HOST                  ?= $(DUNITER_V2S_SERVICE_NAME).$(firstword $(APP_HOST))
 DUNITER_V2S_SERVICE_NAME                  ?= $(DUNITER_V2S_DUNITER_CHAIN_NAME)
+DUNITER_V2S_SERVICE_URI                   ?= $(DUNITER_V2S_SERVICE_NAME).$(firstword $(APP_URI))
 DUNITER_V2S_SERVICE_9615_PATH             ?= metrics/
 DUNITER_V2S_SERVICE_9615_TAGS             ?= $(call tagprefix,DUNITER_V2S,9615)
 DUNITER_V2S_SERVICE_9933_PATH             ?= http/
 DUNITER_V2S_SERVICE_9933_TAGS             ?= $(call tagprefix,DUNITER_V2S,9933)
 DUNITER_V2S_SERVICE_9944_PATH             ?= ws/
-DUNITER_V2S_SERVICE_9944_STRIP            ?= /ws
 DUNITER_V2S_SERVICE_9944_TAGS             ?= $(call tagprefix,DUNITER_V2S,9944)
 DUNITER_V2S_SERVICE_30333_TAGS            ?= $(call tagprefix,DUNITER_V2S,30333)
diff --git a/stack/duniter/v2s.yml b/stack/duniter/v2s.yml
index 7569d2a..40d9916 100644
--- a/stack/duniter/v2s.yml
+++ b/stack/duniter/v2s.yml
@@ -22,7 +22,7 @@ services:
 
   duniter-ui:
     environment:
-    - WS_URL=${DUNITER_UI_WS_URL:-duniter-v2s:9944}
+    - WS_URL=${DUNITER_UI_WS_URL:-ws://duniter-v2s:9944}
     image: jacogr/polkadot-js-apps:latest
     labels:
     - SERVICE_80_CHECK_HTTP=${DUNITER_UI_SERVICE_80_CHECK_HTTP:-/}
@@ -37,12 +37,13 @@ services:
   duniter-v2s:
     environment:
     - DUNITER_CHAIN_NAME=${DUNITER_V2S_DUNITER_CHAIN_NAME:-gdev}
-#     - DUNITER_LISTEN_ADDR=${DUNITER_V2S_DUNITER_LISTEN_ADDR:-/ip4/0.0.0.0/tcp/30333/ws}
+    - DUNITER_LISTEN_ADDR=${DUNITER_V2S_DUNITER_LISTEN_ADDR:-/ip4/0.0.0.0/tcp/30333/ws}
     - DUNITER_NODE_NAME=${DUNITER_V2S_DUNITER_NODE_NAME:-duniter_local}
     - DUNITER_PRUNING_PROFILE=${DUNITER_V2S_DUNITER_PRUNING_PROFILE:-default}
-#     - DUNITER_PUBLIC_ADDR=${DUNITER_V2S_DUNITER_PUBLIC_ADDR:-/dns/localhost/tcp/30333/ws}
+    - DUNITER_PUBLIC_ADDR=${DUNITER_V2S_DUNITER_PUBLIC_ADDR:-/dns/duniter-v2s/tcp/30333/ws}
+    - DUNITER_PUBLIC_RPC=${DUNITER_V2S_DUNITER_PUBLIC_RPC:-}
     - DUNITER_VALIDATOR=${DUNITER_V2S_DUNITER_VALIDATOR:-false}
-    image: duniter/duniter-v2s-gdev:latest
+    image: duniter/duniter-v2s-gdev-800:900-0.9.2
     labels:
 #     - SERVICE_9615_CHECK_HTTP=${DUNITER_V2S_SERVICE_9615_CHECK_HTTP:-/}
 #     - SERVICE_9615_NAME=${COMPOSE_SERVICE_NAME}-duniter-v2s-9615