diff --git a/devbox/cli/devbox b/devbox/cli/devbox
index 39e5821..3d16b18 100755
--- a/devbox/cli/devbox
+++ b/devbox/cli/devbox
@@ -722,6 +722,7 @@ EOFinner
     echo "[INIT] \$(date '+%Y-%m-%d %H:%M:%S') Update VITE_PROXY_WEBSOCKET_CHAT_URL and VITE_PROXY_API_CHAT_URL in frontend/.env.development"    
     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
     sed -i "s|VITE_PROXY_API_CHAT_URL=.*|VITE_PROXY_API_CHAT_URL=https://freeleaps-alpha.com|g" /home/devbox/freeleaps/frontend/freeleaps/.env.development    
+    sed -i 's#http://freeleaps-chat:8012#https://freeleaps-alpha.com#g' /home/devbox/freeleaps/frontend/freeleaps/nginx_docker.conf
 
     echo "[INIT] \$(date '+%Y-%m-%d %H:%M:%S') Online component dev environment variables set."
 fi
@@ -813,6 +814,7 @@ if true ; then
   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
 
@@ -1092,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
@@ -1202,23 +1204,15 @@ 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
     sed -i "s|VITE_PROXY_API_CHAT_URL=.*|VITE_PROXY_API_CHAT_URL=https://freeleaps-alpha.com|g" /home/devbox/freeleaps/frontend/freeleaps/.env.development
-    
+    sed -i 's#VITE_PROXY_WEBSOCKET_CHAT_URL=http://localhost:8012#VITE_PROXY_WEBSOCKET_CHAT_URL=https://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/freeleaps/nginx_docker.conf
   fi
 
-  echo "[FRONTEND] \$(date '+%Y-%m-%d %H:%M:%S') Check frontend environment variables...from /home/devbox/freeleaps/frontend/freeleaps/.env.development"
-  echo "[FRONTEND] \$(date '+%Y-%m-%d %H:%M:%S') \$(tail -n 30 /home/devbox/freeleaps/frontend/freeleaps/.env.development)"
-
-  echo "[FRONTEND] \$(date '+%Y-%m-%d %H:%M:%S') Starting frontend compilation and startup..."
-
-  echo "[FRONTEND] \$(date '+%Y-%m-%d %H:%M:%S') Checking frontend dependencies..."
-  echo "[FRONTEND] \$(date '+%Y-%m-%d %H:%M:%S') Time difference: \$time_diff seconds, lock_time: \$lock_time, modules_time: \$modules_time"
-
   if [[ ! -d "node_modules" || "package.json" -nt "node_modules" ||  \$time_diff -gt \$threshold ]]; then
       echo "[FRONTEND] \$(date '+%Y-%m-%d %H:%M:%S') Installing/Updating frontend dependencies..."
 
@@ -1294,18 +1288,26 @@ docker exec -i "$DEVBOX_NAME" bash <<EOF
       fi
   fi
 
+  # 
+  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/node_modules/@project/freeleaps/.env.development
+    sed -i "s|VITE_PROXY_API_CHAT_URL=.*|VITE_PROXY_API_CHAT_URL=http://localhost:8012|g" /home/devbox/freeleaps/frontend/node_modules/@project/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/node_modules/@project/freeleaps/.env.development
+    sed -i "s|VITE_PROXY_API_CHAT_URL=.*|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
+
+  echo "[FRONTEND] \$(date '+%Y-%m-%d %H:%M:%S') Starting frontend compilation and startup..."
+
   # Start the frontend service
   echo "[FRONTEND] \$(date '+%Y-%m-%d %H:%M:%S') Start frontend service..."
   nohup pnpm run dev > /home/devbox/logs/frontend.logs 2>&1 &
 
-  # Check git status
-  echo 
-  echo "[FRONTEND] \$(date '+%Y-%m-%d %H:%M:%S') Checking git status..."
-  echo
-  git status -s
-  echo
-  echo "[FRONTEND] \$(date '+%Y-%m-%d %H:%M:%S') Git status check completed."
-  echo
+  echo "[FRONTEND] \$(date '+%Y-%m-%d %H:%M:%S') Frontend service started. Logs: /home/devbox/logs/frontend.logs"
 
   # Check the health of the frontend service: poll to detect HTTP status
   MAX_ATTEMPTS=30
@@ -1366,6 +1368,18 @@ docker exec -i "$DEVBOX_NAME" bash <<EOF
     exit 1
   fi
 
+  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/node_modules/@project/freeleaps/.env.development
+    sed -i "s|VITE_PROXY_API_CHAT_URL=.*|VITE_PROXY_API_CHAT_URL=http://localhost:8012|g" /home/devbox/freeleaps/frontend/node_modules/@project/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/node_modules/@project/freeleaps/.env.development
+    sed -i "s|VITE_PROXY_API_CHAT_URL=.*|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
+
   echo
   echo "[FRONTEND]  \$(date '+%Y-%m-%d %H:%M:%S') Frontend compilation and startup completed."
   echo
@@ -1384,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
 }