diff --git a/scripts/deploy-ubuntu.sh b/scripts/deploy-ubuntu.sh
index 52532c1..e592178 100755
--- a/scripts/deploy-ubuntu.sh
+++ b/scripts/deploy-ubuntu.sh
@@ -98,6 +98,9 @@ fail() {
 }
 
 configure_instance_names() {
+	if [[ -z "${SERVICE_SCOPE}" && -n "${CLAW_SERVICE_SCOPE:-}" ]]; then
+		SERVICE_SCOPE="${CLAW_SERVICE_SCOPE}"
+	fi
 	DEPLOY_INSTANCE="${CLAW_DEPLOY_INSTANCE:-${DEPLOY_INSTANCE:-zk-data-agent}}"
 	BACKEND_SERVICE="${CLAW_BACKEND_SERVICE:-${DEPLOY_INSTANCE}-backend}"
 	FRONTEND_SERVICE="${CLAW_FRONTEND_SERVICE:-${DEPLOY_INSTANCE}-frontend}"
diff --git a/scripts/update-server-fast.sh b/scripts/update-server-fast.sh
index 8ac9ae8..f064ca9 100755
--- a/scripts/update-server-fast.sh
+++ b/scripts/update-server-fast.sh
@@ -24,6 +24,9 @@ fail() {
 }
 
 configure_instance_names() {
+	if [[ -z "${SERVICE_SCOPE}" && -n "${CLAW_SERVICE_SCOPE:-}" ]]; then
+		SERVICE_SCOPE="${CLAW_SERVICE_SCOPE}"
+	fi
 	DEPLOY_INSTANCE="${CLAW_DEPLOY_INSTANCE:-${DEPLOY_INSTANCE:-zk-data-agent}}"
 	BACKEND_SERVICE="${CLAW_BACKEND_SERVICE:-${DEPLOY_INSTANCE}-backend}"
 	FRONTEND_SERVICE="${CLAW_FRONTEND_SERVICE:-${DEPLOY_INSTANCE}-frontend}"