diff --git a/.github/release_template.md b/.github/release_template.md
index d130084817..51e027f147 100644
--- a/.github/release_template.md
+++ b/.github/release_template.md
@@ -27,7 +27,9 @@
             <td>Windows</td>
             <td>
                 <a href="https://github.com/chen08209/FlClash/releases/download/vVERSION/FlClash-VERSION-windows-amd64-setup.exe"><img src="https://img.shields.io/badge/Setup-x64-2d7d9a.svg?logo=windows"></a><br>
-                <a href="https://github.com/chen08209/FlClash/releases/download/vVERSION/FlClash-VERSION-windows-amd64.zip"><img src="https://img.shields.io/badge/Portable-x64-67b7d1.svg?logo=windows"></a>
+                <a href="https://github.com/chen08209/FlClash/releases/download/vVERSION/FlClash-VERSION-windows-amd64.zip"><img src="https://img.shields.io/badge/Portable-x64-67b7d1.svg?logo=windows"></a><br>
+                <a href="https://github.com/chen08209/FlClash/releases/download/vVERSION/FlClash-VERSION-windows-arm64-setup.exe"><img src="https://img.shields.io/badge/Setup-ARM64-005a9c.svg?logo=windows"></a><br>
+                <a href="https://github.com/chen08209/FlClash/releases/download/vVERSION/FlClash-VERSION-windows-arm64.zip"><img src="https://img.shields.io/badge/Portable-ARM64-4c9ed9.svg?logo=windows"></a>
             </td>
         </tr>
         <tr>
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 587f198832..f82857a0b8 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -27,9 +27,9 @@ jobs:
           - platform: macos
             os: macos-latest
             arch: arm64
-          #          - platform: windows
-          #            os: windows-11-arm
-          #            arch: arm64
+          - platform: windows
+            os: windows-11-arm
+            arch: arm64
           - platform: linux
             os: ubuntu-24.04-arm
             arch: arm64
@@ -44,10 +44,21 @@ jobs:
           Add-Content $env:GITHUB_PATH $cargoPath
 
       - name: Checkout
+        if: ${{ !startsWith(matrix.os, 'windows-11-arm') }}
         uses: actions/checkout@v4
         with:
           submodules: recursive
 
+      - name: Checkout (Windows ARM)
+        if: startsWith(matrix.os, 'windows-11-arm')
+        uses: actions/checkout@v4
+
+      - name: Setup submodules (Windows ARM)
+        if: startsWith(matrix.os, 'windows-11-arm')
+        run: |
+          git submodule sync --recursive
+          git submodule update --init --recursive
+
       - name: Setup Android Signing
         if: startsWith(matrix.platform,'android')
         run: |
diff --git a/.gitmodules b/.gitmodules
index 70bf7cd87e..b3cd5da558 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,14 +1,14 @@
 [submodule "core/Clash.Meta"]
 	path = core/Clash.Meta
-	url = git@github.com:chen08209/Clash.Meta.git
+	url = https://github.com/chen08209/Clash.Meta.git
 	branch = FlClash
 [submodule "plugins/flutter_distributor"]
 	path = plugins/flutter_distributor
-	url = git@github.com:chen08209/flutter_distributor.git
+	url = https://github.com/chen08209/flutter_distributor.git
 	branch = FlClash
 [submodule "plugins/tray_manager"]
 	path = plugins/tray_manager
-	url = git@github.com:chen08209/tray_manager.git
+	url = https://github.com/chen08209/tray_manager.git
 	branch = main
 
 
diff --git a/release_telegram.py b/release_telegram.py
index f4d5883512..7509d5716b 100644
--- a/release_telegram.py
+++ b/release_telegram.py
@@ -6,7 +6,7 @@
 TAG = os.getenv("TAG")
 RUN_ID = os.getenv("RUN_ID")
 
-IS_STABLE = "-" not in TAG
+IS_STABLE = TAG is not None and "-" not in TAG
 
 CHAT_ID = "@FlClash"
 API_URL = f"http://localhost:8081/bot{TELEGRAM_BOT_TOKEN}/sendMediaGroup"
@@ -23,6 +23,7 @@
 
 releaseKeywords = [
     "windows-amd64-setup",
+    "windows-arm64-setup",
     "android-arm64",
     "macos-arm64",
     "macos-amd64"