diff --git a/.github/workflows/wails.yml b/.github/workflows/wails.yml
index b74234e..6e0071b 100644
--- a/.github/workflows/wails.yml
+++ b/.github/workflows/wails.yml
@@ -15,29 +15,17 @@ env:
   NODE_OPTIONS: "--max-old-space-size=4096"
 
 jobs:
-  build:
+  build-linux:
     strategy:
-    # Failure in one platform build won't impact the others
-      fail-fast: false
       matrix:
         build:
-          - name: 'yellowjacket'
-            platform:  'linux/amd64'
-            os: 'ubuntu-latest'
-            bin-name: 'yellowjacket'
-            artifact-name: 'yellowjacket'
           - name: 'yellowjacket'
             platform:  'windows/amd64'
             os: 'windows-latest'
             bin-name: 'yellowjacket'
             artifact-name: 'yellowjacket.exe'
-          - name: 'yellowjacket'
-            platform:  'darwin/universal'
-            os: 'macos-latest'
-            bin-name: 'yellowjacket.app'
-            artifact-name: 'yellowjacket.app'
 
-    runs-on: ${{ matrix.build.os }}
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -58,23 +46,85 @@ jobs:
         uses: dAppServer/wails-build-action@main
         id: build
         with:
-          build-name: ${{ matrix.build.name }}
-          build-platform: ${{ matrix.build.platform }}
+          build-name: yellowjacket
+          build-platform: 'linux/amd64'
           go-version: '1.24'
           package: false
           app-working-directory: ${{ github.workspace }}
 
-      - run: find ${{ github.workspace }}
+      - run: find ${{ github.workspace }}/build -t f
 
       - name: Upload Binaries
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ matrix.build.artifact-name }}
-          path: ${{ github.workspace }}/build/bin/${{ matrix.build.bin-name }}
+          name: yellowjacket
+          path: ${{ github.workspace }}/build/bin/yellowjacket
+
+  build-mac:
+    runs-on: 'macos-latest'
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          submodules: recursive
+
+      - name: Install pnpm
+        uses: pnpm/action-setup@v4
+        with:
+          version: 10
+
+      - name: Build wails
+        uses: dAppServer/wails-build-action@main
+        id: build
+        with:
+          build-name: yellowjacket
+          build-platform: 'darwin/universal'
+          go-version: '1.24'
+          package: false
+          app-working-directory: ${{ github.workspace }}
+
+      - run: find ${{ github.workspace }}/build -t f
+
+      - name: Upload Binaries
+        uses: actions/upload-artifact@v4
+        with:
+          name: yellowjacket.app
+          path: ${{ github.workspace }}/build/bin/yellowjacket.app
+
+  build-windows:
+    runs-on:  'windows-latest'
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          submodules: recursive
+
+      - name: Install pnpm
+        uses: pnpm/action-setup@v4
+        with:
+          version: 10
+
+      - name: Build wails
+        uses: dAppServer/wails-build-action@main
+        id: build
+        with:
+          build-name: yellowjacket.exe
+          build-platform: 'windows/amd64'
+          go-version: '1.24'
+          package: false
+          app-working-directory: ${{ github.workspace }}
+
+      - run: dir ${{ github.workspace }}\build /s /b
+
+      - name: Upload Binaries
+        uses: actions/upload-artifact@v4
+        with:
+          name: yellowjacket.exe
+          path: ${{ github.workspace }}\build\bin\yellowjacket
 
   release:
     runs-on: ubuntu-latest
-    needs: build
+    needs: [build-linux, build-mac, build-windows]
     steps:
       - name: Download Artifacts
         uses: actions/download-artifact@v4