diff --git a/.github/workflows/build-win-arm64.yml b/.github/workflows/build-win-arm64.yml
deleted file mode 100644
index 2eac5d2..0000000
--- a/.github/workflows/build-win-arm64.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-name: Build Electron App
-
-on:
-  push:
-    branches: [main]
-  pull_request:
-    branches: [main]
-
-jobs:
-  build:
-    runs-on: macos-latest
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Set up Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: 22
-
-      - name: Install dependencies
-        run: npm install
-        working-directory: simpliplay
-
-      - name: Build Windows
-        env:
-          CSC_IDENTITY_AUTO_DISCOVERY: false
-        run: npx electron-builder --win --arm64
-        working-directory: simpliplay
-
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: builds
-          path: simpliplay/dist/
diff --git a/.github/workflows/build-win.yml b/.github/workflows/build-win.yml
new file mode 100644
index 0000000..6c30049
--- /dev/null
+++ b/.github/workflows/build-win.yml
@@ -0,0 +1,64 @@
+name: Build Windows
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+
+jobs:
+  build-x64:
+    runs-on: windows-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 22
+
+      - name: Install dependencies
+        run: npm install
+        working-directory: simpliplay
+
+      - name: Build Windows (x64)
+        env:
+          CSC_IDENTITY_AUTO_DISCOVERY: false
+        run: npx electron-builder --win --x64
+        working-directory: simpliplay
+
+      - name: Upload artifacts (x64)
+        uses: actions/upload-artifact@v4
+        with:
+          name: builds-x64
+          path: simpliplay/dist/
+
+  build-arm64:
+    runs-on: windows-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 22
+
+      - name: Install dependencies
+        run: npm install
+        working-directory: simpliplay
+
+      - name: Build Windows (arm64)
+        env:
+          CSC_IDENTITY_AUTO_DISCOVERY: false
+        run: npx electron-builder --win --arm64
+        working-directory: simpliplay
+
+      - name: Upload artifacts (arm64)
+        uses: actions/upload-artifact@v4
+        with:
+          name: builds-arm64
+          path: simpliplay/dist/