diff --git a/devbox/cli/devbox b/devbox/cli/devbox
index 0d06465..3d16b18 100755
--- a/devbox/cli/devbox
+++ b/devbox/cli/devbox
@@ -799,10 +799,6 @@ if true ; then
   # 4️⃣ Install dependencies
   pnpm store prune
 
-  grep -R "VITE_PROXY_WEBSOCKET_CHAT_URL" /home/devbox/freeleaps/frontend/freeleaps/.env.development
-
-  sleep 20
-
   # 4️⃣ Install dependencies (ensuring lockfile updates)
   pnpm install --no-frozen-lockfile \\
                 --shamefully-hoist \\
@@ -813,16 +809,12 @@ if true ; then
   pnpm run build
 
 
-  grep -R "VITE_PROXY_WEBSOCKET_CHAT_URL" /home/devbox/freeleaps/frontend/
-
-  sleep 20
-
-
   # 5️⃣ Check git status
   echo 
   echo "[INIT] \$(date '+%Y-%m-%d %H:%M:%S') Checking git status..."
   echo 
 
+  pushd /home/devbox/freeleaps > /dev/null
   git config --global --add safe.directory /home/devbox/freeleaps
   git status -s
 
@@ -1102,7 +1094,7 @@ docker exec -i "$DEVBOX_NAME" bash <<EOF
     else
       echo "[BACKEND] \$(date '+%Y-%m-%d %H:%M:%S') Waiting for backend service... Attempt \$((ATTEMPT+1)) with HTTP \$HTTP_CODE"
       ATTEMPT=\$((ATTEMPT+1))
-      sleep 5
+      sleep 10
     fi
   done
   if [ \$ATTEMPT -eq \$MAX_ATTEMPTS ]; then
@@ -1212,8 +1204,6 @@ docker exec -i "$DEVBOX_NAME" bash <<EOF
   echo "[FRONTEND] \$(date '+%Y-%m-%d %H:%M:%S') USE_LOCAL_COMPONENT_VAL: \$USE_LOCAL_COMPONENT_VAL"
   if [[ "\$USE_LOCAL_COMPONENT_VAL" == "true" ]]; then
     echo "[FRONTEND] \$(date '+%Y-%m-%d %H:%M:%S') Use local component dev environment."
-    sed -i "s|VITE_PROXY_WEBSOCKET_CHAT_URL=.*|VITE_PROXY_WEBSOCKET_CHAT_URL=ws://localhost:8012|g" /home/devbox/freeleaps/frontend/freeleaps/.env.development
-    sed -i "s|VITE_PROXY_API_CHAT_URL=.*|VITE_PROXY_API_CHAT_URL=http://localhost:8012|g" /home/devbox/freeleaps/frontend/freeleaps/.env.development
   else
     echo "[FRONTEND] \$(date '+%Y-%m-%d %H:%M:%S') Use online component dev environment."
     sed -i "s|VITE_PROXY_WEBSOCKET_CHAT_URL=.*|VITE_PROXY_WEBSOCKET_CHAT_URL=wss://freeleaps-alpha.com|g" /home/devbox/freeleaps/frontend/freeleaps/.env.development
@@ -1408,6 +1398,21 @@ reset_freeleaps_repo() {
   git reset --hard HEAD
   popd > /dev/null
   echo "[INIT] \$(date '+%Y-%m-%d %H:%M:%S') FreeLeaps repository reset completed."
+
+    USE_LOCAL_COMPONENT_VAL="false"
+  if [ -f "\$USE_LOCAL_COMPONENT_FLAG" ]; then
+    # Read the value from the file
+    USE_LOCAL_COMPONENT_VAL=\$(cat "\$USE_LOCAL_COMPONENT_FLAG")
+  fi
+if [[ "\$USE_LOCAL_COMPONENT_VAL" == "true" ]]; then
+    echo "[FRONTEND] \$(date '+%Y-%m-%d %H:%M:%S') Use local component dev environment."
+  else
+    echo "[FRONTEND] \$(date '+%Y-%m-%d %H:%M:%S') Use online component dev environment."
+    sed -i 's#VITE_PROXY_WEBSOCKET_CHAT_URL=.*#VITE_PROXY_WEBSOCKET_CHAT_URL=wss://freeleaps-alpha.com#g' /home/devbox/freeleaps/frontend/node_modules/@project/freeleaps/.env.development
+    sed -i 's#VITE_PROXY_API_CHAT_URL=http://localhost:8012#VITE_PROXY_API_CHAT_URL=https://freeleaps-alpha.com#g' /home/devbox/freeleaps/frontend/node_modules/@project/freeleaps/.env.development
+    sed -i 's#http://freeleaps-chat:8012#https://freeleaps-alpha.com#g' /home/devbox/freeleaps/frontend/node_modules/@project/freeleaps/nginx_docker.conf
+  fi
+
 EOF
 }