diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c4af10c68..3396b83cc 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -9,25 +9,35 @@ on:
 jobs:
   build-test:
     name: Build and Test
-    runs-on: ${{ matrix.os }}-latest
+    runs-on: ${{ matrix.os.instance }}
     timeout-minutes: 15
 
     strategy:
       fail-fast: false
       matrix:
-        os: [windows, ubuntu, macos]
-        python: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
-        platform: [x64, x86]
-        exclude:
-          - os: ubuntu
-            platform: x86
-          - os: macos
+        os:
+          - category: windows
             platform: x86
+            instance: windows-latest
+
+          - category: windows
+            platform: x64
+            instance: windows-latest
+
+          - category: ubuntu
+            platform: x64
+            instance: ubuntu-latest
+
+          - category: macos
+            platform: x64
+            instance: macos-13
+
+        python: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
 
     steps:
       - name: Set Environment on macOS
         uses: maxim-lobanov/setup-xamarin@v1
-        if: ${{ matrix.os == 'macos' }}
+        if: ${{ matrix.os.category == 'macos' }}
         with:
           mono-version: latest
 
@@ -43,7 +53,7 @@ jobs:
         uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python }}
-          architecture: ${{ matrix.platform }}
+          architecture: ${{ matrix.os.platform }}
 
       - name: Install dependencies
         run: |
@@ -55,42 +65,42 @@ jobs:
           pip install -v .
 
       - name: Set Python DLL path and PYTHONHOME (non Windows)
-        if: ${{ matrix.os != 'windows' }}
+        if: ${{ matrix.os.category != 'windows' }}
         run: |
           echo PYTHONNET_PYDLL=$(python -m find_libpython) >> $GITHUB_ENV
           echo PYTHONHOME=$(python -c 'import sys; print(sys.prefix)') >> $GITHUB_ENV
 
       - name: Set Python DLL path and PYTHONHOME (Windows)
-        if: ${{ matrix.os == 'windows' }}
+        if: ${{ matrix.os.category == 'windows' }}
         run: |
           Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append -InputObject "PYTHONNET_PYDLL=$(python -m find_libpython)"
           Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append -InputObject "PYTHONHOME=$(python -c 'import sys; print(sys.prefix)')"
 
       - name: Embedding tests
-        run: dotnet test --runtime any-${{ matrix.platform }} --logger "console;verbosity=detailed" src/embed_tests/
+        run: dotnet test --runtime any-${{ matrix.os.platform }} --logger "console;verbosity=detailed" src/embed_tests/
         env:
           MONO_THREADS_SUSPEND: preemptive # https://github.com/mono/mono/issues/21466
 
       - name: Python Tests (Mono)
-        if: ${{ matrix.os != 'windows' }}
+        if: ${{ matrix.os.category != 'windows' }}
         run: pytest --runtime mono
 
       # TODO: Run these tests on Windows x86
       - name: Python Tests (.NET Core)
-        if: ${{ matrix.platform == 'x64' }}
+        if: ${{ matrix.os.platform == 'x64' }}
         run: pytest --runtime coreclr
 
       - name: Python Tests (.NET Framework)
-        if: ${{ matrix.os == 'windows' }}
+        if: ${{ matrix.os.category == 'windows' }}
         run: pytest --runtime netfx
 
       - name: Python tests run from .NET
-        run: dotnet test --runtime any-${{ matrix.platform }} src/python_tests_runner/
+        run: dotnet test --runtime any-${{ matrix.os.platform }} src/python_tests_runner/
 
       - name: Perf tests
-        if: ${{ (matrix.python == '3.8') && (matrix.platform == 'x64') }}
+        if: ${{ (matrix.python == '3.8') && (matrix.os.platform == 'x64') }}
         run: |
           pip install --force --no-deps --target src/perf_tests/baseline/ pythonnet==2.5.2
-          dotnet test --configuration Release --runtime any-${{ matrix.platform }} --logger "console;verbosity=detailed" src/perf_tests/
+          dotnet test --configuration Release --runtime any-${{ matrix.os.platform }} --logger "console;verbosity=detailed" src/perf_tests/
 
       # TODO: Run mono tests on Windows?

<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<title>pFad - Phonifier reborn</title>
<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
</head>
<body>
<h1>Pfad - The Proxy pFad of &#169; 2024 Garber Painting. All rights reserved.</h1>


<!-- Disclaimer -->
<p>Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.</p>
<br>
<p>Alternative Proxies:</p><p><a href="http://rainy.clevelandohioweatherforecast.com/php-proxy/index.php?q=https://patch-diff.githubusercontent.com/raw/pythonnet/pythonnet/pull/2373.diff" target="_blank">Alternative Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/index.php?u=https://patch-diff.githubusercontent.com/raw/pythonnet/pythonnet/pull/2373.diff" target="_blank">pFad Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v3index.php?u=https://patch-diff.githubusercontent.com/raw/pythonnet/pythonnet/pull/2373.diff" target="_blank">pFad v3 Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v4index.php?u=https://patch-diff.githubusercontent.com/raw/pythonnet/pythonnet/pull/2373.diff" target="_blank">pFad v4 Proxy</a></p></body>
</html>