diff --git a/abra.sh b/abra.sh
index 2414a13..7405c82 100644
--- a/abra.sh
+++ b/abra.sh
@@ -1,2 +1,2 @@
-export SERVER_ENTRYPOINT_VERSION=2
-export BRIDGE_ENTRYPOINT_VERSION=2
+export SERVER_ENTRYPOINT_VERSION=3
+export BRIDGE_ENTRYPOINT_VERSION=3
diff --git a/compose.yml b/compose.yml
index 704d978..4d4cecc 100644
--- a/compose.yml
+++ b/compose.yml
@@ -4,9 +4,10 @@ version: "3.8"
 services:
   app:
     environment:
-      - AGORA_USER=$AGORA_USER
-      - AGORA_PATH=$AGORA_PATH
-      - AGORA_GIT=$AGORA_GIT
+      - AGORA_USER
+      - AGORA_PATH
+      - AGORA_GIT
+      - AGORA_NAME
     image: git.coopcloud.tech/flancian/agora-server:latest
     configs:
       - source: server_entrypoint
@@ -44,9 +45,10 @@ services:
 
   bridge:
     environment:
-      - AGORA_USER=$AGORA_USER
-      - AGORA_PATH=$AGORA_PATH
-      - AGORA_GIT=$AGORA_GIT
+      - AGORA_USER
+      - AGORA_PATH
+      - AGORA_GIT
+      - AGORA_NAME
     image: git.coopcloud.tech/flancian/agora-bridge:latest
     configs:
       - source: bridge_entrypoint
diff --git a/entrypoint.bridge.sh.tmpl b/entrypoint.bridge.sh.tmpl
index 8e413a5..7a71309 100755
--- a/entrypoint.bridge.sh.tmpl
+++ b/entrypoint.bridge.sh.tmpl
@@ -9,7 +9,7 @@ init_root() {
 main() {
 	set -eu
     init_root
-    /home/$AGORA_USER/agora-bridge/run-dev.sh
+    /home/$AGORA_USER/agora-bridge/entrypoint.sh
 }
 
 main
diff --git a/entrypoint.server.sh.tmpl b/entrypoint.server.sh.tmpl
index 5542e2a..c82b2cd 100755
--- a/entrypoint.server.sh.tmpl
+++ b/entrypoint.server.sh.tmpl
@@ -10,7 +10,7 @@ init_root() {
 main() {
 	set -eu
     init_root
-    /home/$AGORA_USER/agora-server/run-localdev.sh
+    /home/$AGORA_USER/agora-server/entrypoint.sh
     # tail -f /dev/null
 }