diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0b67ea3c120..0118d66f070 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -107,23 +107,20 @@ jobs:
     strategy:
       matrix:
         go-version: ["~1.22.0", "~1.21.3"]
-        os: [ubuntu-latest, macos-latest, windows-latest, actuated-arm64-4cpu-4gb]
-        arch: ["386", amd64, arm64]
-        exclude:
-          # Not a supported Go OS/architecture.
+        platform:
           - os: ubuntu-latest
-            arch: arm64
-          - os: macos-latest
-            arch: arm64
-          - os: macos-latest
             arch: "386"
+          - os: ubuntu-latest
+            arch: amd64
+          - os: macos-latest
+            arch: amd64
           - os: windows-latest
-            arch: arm64
-          - os: actuated-arm64-4cpu-4gb
             arch: "386"
-          - os: actuated-arm64-4cpu-4gb
+          - os: windows-latest
             arch: amd64
-    runs-on: ${{ matrix.os }}
+          - os: actuated-arm64-4cpu-4gb
+            arch: arm64
+    runs-on: ${{ matrix.platform.os }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -135,7 +132,7 @@ jobs:
           cache-dependency-path: "**/go.sum"
       - name: Run tests
         env:
-          GOARCH: ${{ matrix.arch }}
+          GOARCH: ${{ matrix.platform.arch }}
         run: make test-short
 
   test-compatibility: