diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e6e10f7..a71cad6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -5,11 +5,12 @@ on:
   pull_request:
 
 jobs:
-
   build:
     name: Build (${{ matrix.os_name }})
     env:
       GO_VERSION: 1.22
+      GOOS: ${{ matrix.os_name }}
+      GOARCH: ${{ matrix.arch }}
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
@@ -17,10 +18,13 @@ jobs:
         include:
           - os: ubuntu-latest
             os_name: linux
+            arch: amd64
           - os: windows-latest
             os_name: windows
-          - os: macos-latest
-            os_name: macos
+            arch: amd64
+# TODO macos needs universal binary!
+#          - os: macos-latest
+#            os_name: macos
     steps:
       - uses: actions/checkout@v4
       - name: Set up Go ${{ env.GO_VERSION }}
@@ -36,7 +40,7 @@ jobs:
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
-          name: rogueserver-${{ matrix.os_name }}-${{ github.sha }}
+          name: rogueserver-${{ matrix.os_name }}-${{ matrix.arch }}-${{ github.sha }}
           path: |
             rogueserver*
             !rogueserver.go