diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 20addaa..45d62de 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -2,14 +2,35 @@ name: Go
 on: [push, pull_request]
 
 jobs:
-  build:
+  build-linux:
     strategy:
         matrix:
           go-version: [ '1.20.x', '1.21.x' ]
-          goos: [linux, darwin]
-          arch: [amd64, arm, arm64]
+          goos: [linux]
+          goarch: [amd64, arm64]
     runs-on: ubuntu-latest
 
+    steps:
+      - uses: actions/checkout@v4
+      - name: Setup Go
+        uses: actions/setup-go@v4
+        with:
+          go-version: '${{matrix.go-version}}'
+      - name: Install dependencies
+        run: go get ./...
+      - name: Build Client
+        run: env GOOS=${{matrix.goos}} GOARCH=${{matrix.goarch}} go build -v client/main.go
+      - name: Build Server
+        run: env GOOS=${{matrix.goos}} GOARCH=${{matrix.goarch}} go build -v server/main.go
+      - name: Test with the Go CLI
+        run: env GOOS=${{matrix.goos}} GOARCH=${{matrix.goarch}} go run github.com/onsi/ginkgo/v2/ginkgo -r
+  build-macos:
+    strategy:
+      matrix:
+        go-version: [ '1.20.x', '1.21.x' ]
+        goos: [darwin]
+        goarch: [amd64, arm64]
+    runs-on: macos-latest
     steps:
       - uses: actions/checkout@v4
       - name: Setup Go