diff --git a/scripts/deploy/sync-env-from-server.sh b/scripts/deploy/sync-env-from-server.sh
index 09f1eb79f..fda96a266 100644
--- a/scripts/deploy/sync-env-from-server.sh
+++ b/scripts/deploy/sync-env-from-server.sh
@@ -5,14 +5,16 @@
 #   PROJECT=edr-freight BRANCH=main ./scripts/deploy/sync-env-from-server.sh freight-api freight-portal freight-backoffice
 #
 # Server layout (one file per service):
-#   /home/user/environmen/<project>/<branch>/freight-api.env
-#   /home/user/environmen/<project>/<branch>/freight-portal.env
-#   /home/user/environmen/<project>/<branch>/freight-web.build.env  (optional, exports VITE_API_URL etc.)
+#   /home/user/environmen/<project>/<branch-slug>/freight-api.env
+#   /home/user/environmen/<project>/<branch-slug>/freight-portal.env
+#   /home/user/environmen/<project>/<branch-slug>/freight-web.build.env  (optional, exports VITE_API_URL etc.)
 
 set -euo pipefail
 
 DEPLOY_USER="${DEPLOY_USER:-tria}"
-ENV_ROOT="${ENV_ROOT:-/home/${DEPLOY_USER}/environmen/${PROJECT:?PROJECT is required}/${BRANCH:?BRANCH is required}}"
+BRANCH="${BRANCH:?BRANCH is required}"
+BRANCH_SLUG="${BRANCH_SLUG:-$(echo "${BRANCH}" | tr "[:upper:]" "[:lower:]" | sed -E "s/[^a-z0-9]+/-/g; s/^-+//; s/-+$//")}"
+ENV_ROOT="${ENV_ROOT:-/home/${DEPLOY_USER}/environmen/${PROJECT:?PROJECT is required}/${BRANCH_SLUG}}"
 
 if [[ ! -d "${ENV_ROOT}" ]]; then
   echo "Environment directory not found: ${ENV_ROOT}" >&2