diff --git a/.github/workflows/alpha-release.yml b/.github/workflows/alpha-release.yml
index 36006336..a5b24419 100644
--- a/.github/workflows/alpha-release.yml
+++ b/.github/workflows/alpha-release.yml
@@ -20,25 +20,51 @@ jobs:
       matrix:
         include:
           - os: ubuntu-latest
-            platform: linux/amd64
+            goos: linux
+            goarch: amd64
           - os: ubuntu-latest
-            platform: linux/arm64
+            goos: linux
+            goarch: arm64
           - os: macos-latest
-            platform: darwin/universal
+            goos: darwin
+            goarch: arm64
           - os: windows-latest
-            platform: windows/amd64
+            goos: windows
+            goarch: amd64
     runs-on: ${{ matrix.os }}
+    env:
+      GOOS: ${{ matrix.goos }}
+      GOARCH: ${{ matrix.goarch }}
     steps:
       - uses: actions/checkout@v6
 
-      - name: Build
-        uses: host-uk/build@v4.0.0
+      # GUI build disabled until build action supports Wails v3
+      # - name: Wails Build Action
+      #   uses: host-uk/build@v4.0.0
+      #   with:
+      #     build-name: core
+      #     build-platform: ${{ matrix.goos }}/${{ matrix.goarch }}
+      #     build: true
+      #     package: true
+      #     sign: false
+
+      - name: Setup Go
+        uses: host-uk/build/actions/setup/go@v4.0.0
         with:
-          build-name: core
-          build-platform: ${{ matrix.platform }}
-          build: true
-          package: true
-          sign: false
+          go-version: "1.25"
+
+      - name: Build CLI
+        shell: bash
+        run: |
+          EXT=""
+          if [ "$GOOS" = "windows" ]; then EXT=".exe"; fi
+          go build -o "./bin/core${EXT}" .
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: core-${{ matrix.goos }}-${{ matrix.goarch }}
+          path: ./bin/core*
 
   release:
     needs: build
diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml
index 139a77e2..c928aa58 100644
--- a/.github/workflows/pr-build.yml
+++ b/.github/workflows/pr-build.yml
@@ -26,21 +26,37 @@ jobs:
       matrix:
         include:
           - os: ubuntu-latest
-            platform: linux/amd64
+            goos: linux
+            goarch: amd64
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6
         with:
           ref: ${{ github.event.pull_request.head.sha || github.sha }}
 
-      - name: Build
-        uses: host-uk/build@v4.0.0
+      # GUI build disabled until build action supports Wails v3
+      # - name: Wails Build Action
+      #   uses: host-uk/build@v4.0.0
+      #   with:
+      #     build-name: core
+      #     build-platform: ${{ matrix.goos }}/${{ matrix.goarch }}
+      #     build: true
+      #     package: true
+      #     sign: false
+
+      - name: Setup Go
+        uses: host-uk/build/actions/setup/go@v4.0.0
         with:
-          build-name: core
-          build-platform: ${{ matrix.platform }}
-          build: true
-          package: true
-          sign: false
+          go-version: "1.25"
+
+      - name: Build CLI
+        run: go build -o ./bin/core .
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: core-${{ matrix.goos }}-${{ matrix.goarch }}
+          path: ./bin/core
 
   draft-release:
     needs: build
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 962171ff..173e7c81 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -15,25 +15,51 @@ jobs:
       matrix:
         include:
           - os: ubuntu-latest
-            platform: linux/amd64
+            goos: linux
+            goarch: amd64
           - os: ubuntu-latest
-            platform: linux/arm64
+            goos: linux
+            goarch: arm64
           - os: macos-latest
-            platform: darwin/universal
+            goos: darwin
+            goarch: arm64
           - os: windows-latest
-            platform: windows/amd64
+            goos: windows
+            goarch: amd64
     runs-on: ${{ matrix.os }}
+    env:
+      GOOS: ${{ matrix.goos }}
+      GOARCH: ${{ matrix.goarch }}
     steps:
       - uses: actions/checkout@v6
 
-      - name: Build
-        uses: host-uk/build@v4.0.0
+      # GUI build disabled until build action supports Wails v3
+      # - name: Wails Build Action
+      #   uses: host-uk/build@v4.0.0
+      #   with:
+      #     build-name: core
+      #     build-platform: ${{ matrix.goos }}/${{ matrix.goarch }}
+      #     build: true
+      #     package: true
+      #     sign: false
+
+      - name: Setup Go
+        uses: host-uk/build/actions/setup/go@v4.0.0
         with:
-          build-name: core
-          build-platform: ${{ matrix.platform }}
-          build: true
-          package: true
-          sign: false
+          go-version: "1.25"
+
+      - name: Build CLI
+        shell: bash
+        run: |
+          EXT=""
+          if [ "$GOOS" = "windows" ]; then EXT=".exe"; fi
+          go build -o "./bin/core${EXT}" .
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: core-${{ matrix.goos }}-${{ matrix.goarch }}
+          path: ./bin/core*
 
   release:
     needs: build