diff --git a/devbox/cli/devbox b/devbox/cli/devbox
index abb8013..0d06465 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
@@ -1217,17 +1218,11 @@ docker exec -i "$DEVBOX_NAME" bash <<EOF
     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..."
 
@@ -1304,6 +1299,7 @@ docker exec -i "$DEVBOX_NAME" bash <<EOF
   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
@@ -1311,28 +1307,17 @@ docker exec -i "$DEVBOX_NAME" bash <<EOF
   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|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 &
 
   echo "[FRONTEND] \$(date '+%Y-%m-%d %H:%M:%S') Frontend service started. Logs: /home/devbox/logs/frontend.logs"
-  grep -R "VITE_PROXY_WEBSOCKET_CHAT_URL" /home/devbox/freeleaps/frontend/
-
-  echo 
-
-  # 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
 
   # Check the health of the frontend service: poll to detect HTTP status
   MAX_ATTEMPTS=30
@@ -1393,6 +1378,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