diff --git a/.github/workflows/publish-alpha.yml b/.github/workflows/publish-alpha.yml
index fab1bb335..96b93aa3a 100644
--- a/.github/workflows/publish-alpha.yml
+++ b/.github/workflows/publish-alpha.yml
@@ -155,17 +155,6 @@ jobs:
                       pnpm run publish:win:alpha
                   on_retry_command: pnpm cache delete
 
-            - name: Build and Publish to R2 (Windows ARM64)
-              if: matrix.os == 'windows-latest'
-              uses: nick-invision/retry@v2.8.2
-              with:
-                  timeout_minutes: 30
-                  max_attempts: 3
-                  retry_on: error
-                  command: |
-                      pnpm run publish:win-arm64:alpha
-                  on_retry_command: pnpm cache delete
-
             - name: Build and Publish to R2 (macOS)
               if: matrix.os == 'macos-latest'
               uses: nick-invision/retry@v2.8.2
diff --git a/.github/workflows/publish-beta.yml b/.github/workflows/publish-beta.yml
index 430acfb49..3bcf1ac97 100644
--- a/.github/workflows/publish-beta.yml
+++ b/.github/workflows/publish-beta.yml
@@ -155,19 +155,6 @@ jobs:
                       pnpm run publish:win:beta
                   on_retry_command: pnpm cache delete
 
-            - name: Build and Publish releases (Windows ARM64)
-              if: matrix.os == 'windows-latest'
-              env:
-                  GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-              uses: nick-invision/retry@v2.8.2
-              with:
-                  timeout_minutes: 30
-                  max_attempts: 3
-                  retry_on: error
-                  command: |
-                      pnpm run publish:win-arm64:beta
-                  on_retry_command: pnpm cache delete
-
             - name: Build and Publish releases (macOS)
               if: matrix.os == 'macos-latest'
               env:
diff --git a/.github/workflows/publish-pr.yml b/.github/workflows/publish-pr.yml
index 2661a6e52..4f5389f74 100644
--- a/.github/workflows/publish-pr.yml
+++ b/.github/workflows/publish-pr.yml
@@ -50,16 +50,6 @@ jobs:
                   command: |
                       pnpm run package:win:pr
 
-            - name: Build for Windows (ARM64)
-              if: ${{ matrix.os == 'windows-latest' }}
-              uses: nick-invision/retry@v2.8.2
-              with:
-                  timeout_minutes: 30
-                  max_attempts: 3
-                  retry_on: error
-                  command: |
-                      pnpm run package:win-arm64:pr
-
             - name: Build for Linux
               if: ${{ matrix.os == 'ubuntu-latest' }}
               uses: nick-invision/retry@v2.8.2
diff --git a/.github/workflows/publish-windows.yml b/.github/workflows/publish-windows.yml
index 437112c9d..8c23d86e6 100644
--- a/.github/workflows/publish-windows.yml
+++ b/.github/workflows/publish-windows.yml
@@ -33,15 +33,3 @@ jobs:
                   command: |
                       pnpm run publish:win
                   on_retry_command: pnpm cache delete
-
-            - name: Build and Publish releases (ARM64)
-              env:
-                  GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-              uses: nick-invision/retry@v2.8.2
-              with:
-                  timeout_minutes: 30
-                  max_attempts: 3
-                  retry_on: error
-                  command: |
-                      pnpm run publish:win-arm64
-                  on_retry_command: pnpm cache delete
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 7e9bc86ed..7abf4572b 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -35,19 +35,6 @@ jobs:
                       pnpm run publish:win
                   on_retry_command: pnpm cache delete
 
-            - name: Build and Publish releases (Windows ARM64)
-              if: matrix.os == 'windows-latest'
-              env:
-                  GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-              uses: nick-invision/retry@v2.8.2
-              with:
-                  timeout_minutes: 30
-                  max_attempts: 3
-                  retry_on: error
-                  command: |
-                      pnpm run publish:win-arm64
-                  on_retry_command: pnpm cache delete
-
             - name: Build and Publish releases (macOS)
               if: matrix.os == 'macos-latest'
               env:
diff --git a/electron-builder-alpha.yml b/electron-builder-alpha.yml
index 4d4175ac3..cc31688f1 100644
--- a/electron-builder-alpha.yml
+++ b/electron-builder-alpha.yml
@@ -13,9 +13,15 @@ asarUnpack:
     - resources/**
 win:
     target:
-        - zip
-        - nsis
-    icon: assets/icons/icon.png
+        - target: zip
+          arch:
+              - x64
+              - arm64
+        - target: nsis
+          arch:
+              - x64
+              - arm64
+    icon: assets/icons/icon.ico
 
 nsis:
     allowToChangeInstallationDirectory: true
diff --git a/electron-builder-beta.yml b/electron-builder-beta.yml
index 60e5ff39a..96dda1520 100644
--- a/electron-builder-beta.yml
+++ b/electron-builder-beta.yml
@@ -13,9 +13,15 @@ asarUnpack:
     - resources/**
 win:
     target:
-        - zip
-        - nsis
-    icon: assets/icons/icon.png
+        - target: zip
+          arch:
+              - x64
+              - arm64
+        - target: nsis
+          arch:
+              - x64
+              - arm64
+    icon: assets/icons/icon.ico
 
 nsis:
     allowToChangeInstallationDirectory: true
diff --git a/electron-builder.yml b/electron-builder.yml
index 6939eb381..26f597bef 100644
--- a/electron-builder.yml
+++ b/electron-builder.yml
@@ -13,8 +13,14 @@ asarUnpack:
     - resources/**
 win:
     target:
-        - zip
-        - nsis
+        - target: zip
+          arch:
+              - x64
+              - arm64
+        - target: nsis
+          arch:
+              - x64
+              - arm64
     icon: assets/icons/icon.ico
 
 nsis: