diff --git a/.github/workflows/build-extension.yml b/.github/workflows/build-extension.yml
index ddcef7b..d7d9725 100644
--- a/.github/workflows/build-extension.yml
+++ b/.github/workflows/build-extension.yml
@@ -68,7 +68,7 @@ jobs:
           asset_content_type: application/zip
 
       - name: Archive artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: browser-extension-${{ inputs.host }}-${{ github.run_number }}
           path: build/apps/browser-extension/
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2174417..0a30308 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -46,10 +46,22 @@ jobs:
 #
   desktop:
     needs: check
-    runs-on: ${{ matrix.os }}
+    runs-on: ${{ matrix.runs_on }}
     strategy:
       matrix:
-        os: [macos-latest, ubuntu-latest, windows-latest]
+        include:
+          - os: macos
+            runs_on: macos-latest
+            artifact_suffix: macos-universal
+            electron_builder_args: -c electron-builder-config.json --universal
+          - os: linux
+            runs_on: ubuntu-latest
+            artifact_suffix: linux-x64
+            electron_builder_args: -c electron-builder-config.json --x64
+          - os: windows
+            runs_on: windows-latest
+            artifact_suffix: windows-x64
+            electron_builder_args: -c electron-builder-config.json --x64
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
@@ -81,12 +93,12 @@ jobs:
           release: ${{ startsWith(github.ref, 'refs/tags/v') }}
           skip_build: true
           package_root: packages/app/
-          args: -c electron-builder-config.json
+          args: ${{ matrix.electron_builder_args }}
 
       - name: Archive artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
-          name: live-comment-for-${{ matrix.os }}-${{ github.run_number }}
+          name: live-comment-for-${{ matrix.artifact_suffix }}-${{ github.run_number }}
           path: packages/app/dist/live-comment*
 #
 # Build server side apps
@@ -150,7 +162,7 @@ jobs:
           asset_content_type: application/zip
 
       - name: Archive artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: server-apps-${{ github.run_number }}
           path: build/apps/
diff --git a/packages/app/electron-builder-config.json b/packages/app/electron-builder-config.json
index 2fbf087..71194df 100644
--- a/packages/app/electron-builder-config.json
+++ b/packages/app/electron-builder-config.json
@@ -16,6 +16,7 @@
     "releaseType": "draft"
   },
   "win": {
+    "artifactName": "${productName}-${version}-${arch}.${ext}",
     "target": [{
       "target": "nsis",
       "arch": ["x64"]
@@ -24,6 +25,7 @@
     "icon": "resources/kujira.png"
   },
   "mac": {
+    "artifactName": "${productName}-${version}-${arch}.${ext}",
     "target": [{
       "target": "dmg",
       "arch": ["x64"]
@@ -33,6 +35,7 @@
   },
   "linux": {
     "executableName": "live-comment",
+    "artifactName": "${productName}-${version}-${arch}.${ext}",
     "target": [{
       "target": "deb",
       "arch": ["x64"]