diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index 363ac04..1d2c12c 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -9,12 +9,11 @@ jobs:
     strategy:
       matrix:
         os:
-          - ubuntu-22.04
-          - ubuntu-24.04
-          - ubuntu-24.04-arm
-          - macos-15
+          - ubuntu-26.04
+          - ubuntu-26.04-arm
           - macos-26
           - windows-latest
+          - windows-11-arm
       fail-fast: false
     runs-on: ${{ matrix.os }}
     steps:
@@ -87,5 +86,5 @@ jobs:
       - name: Test with race detector
         # combination of macos runners being slow and race detector messing with
         # timing makes this combination too flaky for now
-        if: "!startsWith(matrix.os, 'macos-')"
+        if: "!startsWith(matrix.os, 'macos-') && !(startsWith(matrix.os, 'windows-') && endsWith(matrix.os, '-arm'))"
         run: go tool mage test:goRace