diff --git a/doc/docs/get-started/echokit-box.md b/doc/docs/get-started/echokit-box.md
index 1d2f1a1..e6fb795 100644
--- a/doc/docs/get-started/echokit-box.md
+++ b/doc/docs/get-started/echokit-box.md
@@ -45,10 +45,10 @@ Once paired via Bluetooth, you’ll be redirected to a setup interface where you
 - **Wi-Fi Network**: Your Wi-Fi network name. It MUST be a 2.4G network.  
 - **Wi-Fi Password**: Your Wi-Fi access code  
 - **EchoKit Server**: The IP and port of the EchoKit Server you're connecting to. You can use our hosted servers depending on your location:
-    - US: ws://indie.echokit.dev/ws
-    - EU: ws://eu.echokit.dev/ws
-    - Taiwan and southeast Asia: ws://tw.echokit.dev/ws
-    - Rest of the world: [run your own EchoKit server](echokit-server.md)
+    - US: `ws://indie.echokit.dev/ws`
+    - Taiwan and southeast Asia: `ws://tw.echokit.dev/ws`
+    - Rest of the world: `ws://echokit-server.fly.dev/ws`
+    - Everyone: [run your own EchoKit server](echokit-server.md)
 - **Background Image (Optional)**: Upload a transparent GIF image (320x240 px) as the background for the EchoKit Box device.
 
 ![](../server/connect-echokit-new.png)
diff --git a/doc/docs/get-started/echokit-diy.md b/doc/docs/get-started/echokit-diy.md
index 92f4047..5271659 100644
--- a/doc/docs/get-started/echokit-diy.md
+++ b/doc/docs/get-started/echokit-diy.md
@@ -47,11 +47,11 @@ Once paired via Bluetooth, you’ll be redirected to a setup interface where you
 - **Wi-Fi Network**: Your Wi-Fi network name. It MUST be a 2.4G network.
 - **Wi-Fi Password**: Your Wi-Fi access code  
 - **EchoKit Server**: The IP and port of the EchoKit Server you're connecting to. You can use our hosted servers depending on your location:
-    - 🇺🇸 US: `ws://indie.echokit.dev/ws`
-    - 🇭🇰 EU: `ws://eu.echokit.dev/ws`
-    - 🇹🇼 Taiwan and southeast Asia: `ws://tw.echokit.dev/ws`
-    - 🇸🇬 Rest of the world: [run your own EchoKit server](echokit-server.md)
-- **Background Image**: Upload a transparent GIF image as the background for the device.
+    - US: `ws://indie.echokit.dev/ws`
+    - Taiwan and southeast Asia: `ws://tw.echokit.dev/ws`
+    - Rest of the world: `ws://echokit-server.fly.dev/ws`
+    - Everyone: [run your own EchoKit server](echokit-server.md)
+- **Background Image (Optional)**: Upload a transparent GIF image (320x240 px) as the background for the EchoKit device.
 
 ![](../server/connect-echokit-new.png)
 For each required field, click the **"Save Configuration"** button on the web page after entering the three values (Wi-Fi Network, Wi-Fi Password, and EchoKit Server). If you wish to set a background image, you can upload it as an optional fourth value.
diff --git a/doc/docs/get-started/echokit-server.md b/doc/docs/get-started/echokit-server.md
index f37542c..9afa7b1 100644
--- a/doc/docs/get-started/echokit-server.md
+++ b/doc/docs/get-started/echokit-server.md
@@ -49,7 +49,9 @@ You are a helpful assistant. Answer truthfully and concisely. Always answer in E
 """
 ```
 
-> Learn more about [how to configure the EchoKit server](../server/configure-echokit-server.md), especially for [Chinese users](../server/qwen.md).
+Learn more about [how to configure the EchoKit server](../server/configure-echokit-server.md).
+
+> If you are based in mainland China (or Hong Kong), you will need to use [Chinese AI services](../server/qwen.md).
 
 **Next,** [connect the Echokit device to the EchoKit server](../server/setup.md) 
 
diff --git a/doc/docs/hardware/flash-firmware.md b/doc/docs/hardware/flash-firmware.md
index a1c6f8c..8180470 100644
--- a/doc/docs/hardware/flash-firmware.md
+++ b/doc/docs/hardware/flash-firmware.md
@@ -25,7 +25,7 @@ You need to use an USB cable to connect between your computer and the USB-C port
 
 Click on **Connect** at the top menu to connect to your device via the USB cable.
 
-> TROUBLESHOOTING: If it fails, you may force the EchoKit device to enter the "flashing" mode. Press and hold down the **RST button** ([DIY](buttons-echokit-diy.md)), and at the same time, press and release the **K0 button** ([DIY](buttons-echokit-diy.md)). The screen could go dark, and the device will be ready to flash.
+> TROUBLESHOOTING: If it fails, you may force the EchoKit device to enter the "flashing" mode. Press and hold down the **RST button** ([DIY](buttons-echokit-diy.md) | [BOX](buttons-echokit-box.md)), and at the same time, press and release the **K0 button** ([DIY](buttons-echokit-diy.md) | [BOX](buttons-echokit-box.md)). The screen could go dark, and the device will be ready to flash.
 
 Click on the **Flash** button at the bottom of the page to start flashing firmware onto the device. 
 You will see a console showing the flashing progress. 
@@ -38,7 +38,7 @@ Once it is done. Click on the **Reset Device** button as instructed.
 
 ![EchoKit is ready](display.png)
 
-Next, go to the Getting Started Guide for EchoKit [DIY](../get-started/echokit-diy.md) or [BOX](../get-started/echokit-box.md)to configure your EchoKit device for network access.
+Next, go to the Getting Started Guide for EchoKit [DIY](../get-started/echokit-diy.md) or [BOX](../get-started/echokit-box.md) to configure your EchoKit device for network access.
 
 ## 3. Use a command line tool to flash
 
@@ -62,7 +62,7 @@ Fetch the latest precompiled EchoKit firmware:
 
 ```bash
 # For EchoKit DIY
-curl -L -o echokit https://echokit.dev/firmware/echokit_board
+curl -L -o echokit https://echokit.dev/firmware/echokit_boards
 
 # OR
 
diff --git a/doc/docs/server/setup.md b/doc/docs/server/setup.md
index df92bdc..4c53102 100644
--- a/doc/docs/server/setup.md
+++ b/doc/docs/server/setup.md
@@ -23,10 +23,9 @@ Before starting, make sure you have:
 4. Enter the following details:  
    * **Wi-Fi name (SSID)**  EchoKit supports 2.4 GHz WiFi only.
    * **Wi-Fi password**  
-   * **EchoKit server URL** E.g., public server: `ws://indie.echokit.dev/ws`, or peronal server on the local network: `ws://192.168.2.101:8080/ws`
+   * **EchoKit server URL** E.g., public server: `ws://echokit-server.fly.dev/ws`, or personal server on the local network: `ws://192.168.2.101:8080/ws`
 
  
-
 ![Set up EchoKit server](connect-echokit-new.png)
 
 5. Click the **Save Changes** button to apply the new settings. Meanwhile, you will see the EchoKit device will restrart automatically.