diff --git a/setuper/setup.sh b/setuper/setup.sh
index 744c53d..cddf1e3 100644
--- a/setuper/setup.sh
+++ b/setuper/setup.sh
@@ -15,13 +15,17 @@ if [ ! -f "$ENV_FILE" ]; then
     exit 1
 fi
 
-SERVICES_DIR=$(grep '^SERVICES_DIR=' "$ENV_FILE" | cut -d'=' -f2- | tr -d '"')
-CONTROLLER_API=$(grep '^CONTROLLER_API=' "$ENV_FILE" | cut -d'=' -f2- | tr -d '"')
-SECRET_TOKEN=$(grep '^SECRET_TOKEN=' "$ENV_FILE" | cut -d'=' -f2- | tr -d '"')
+SERVICES_DIR=$(grep '^SERVICES_DIR=' "$ENV_FILE" | cut -d'=' -f2- | tr -d '"' | xargs)
+CONTROLLER_API=$(grep '^CONTROLLER_API=' "$ENV_FILE" | cut -d'=' -f2- | tr -d '"' | xargs)
+SECRET_TOKEN=$(grep '^SECRET_TOKEN=' "$ENV_FILE" | cut -d'=' -f2- | tr -d '"' | xargs)
 
 # Defaults
-CONTROLLER_API="${CONTROLLER_API:-http://localhost:8001}"
-SECRET_TOKEN="${SECRET_TOKEN:-change-me-in-production}"
+if [ -z "$CONTROLLER_API" ]; then
+    CONTROLLER_API="http://localhost:8001"
+fi
+if [ -z "$SECRET_TOKEN" ]; then
+    SECRET_TOKEN="change-me-in-production"
+fi
 
 echo "=== A/D Infrastructure Setuper (NEW) ==="
 echo "Game services directory: $SERVICES_DIR"