diff --git a/.github/settings.yml b/.github/settings.yml
index 1ee6ee8..d9b8162 100644
--- a/.github/settings.yml
+++ b/.github/settings.yml
@@ -61,7 +61,7 @@ branches:
       required_pull_request_reviews: null
       required_status_checks:
         strict: false
-        contexts: ['Build & Test', 'Build & Test (Windows)']
+        contexts: ['Build & Test (ubuntu-latest)', 'Build & Test (windows-latest)']
       enforce_admins: false
       required_linear_history: false
       restrictions: null
diff --git a/.github/workflows/build-win.yml b/.github/workflows/build-win.yml
deleted file mode 100644
index 7998d80..0000000
--- a/.github/workflows/build-win.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-name: Build Win
-
-on:
-  push:
-    branches:
-      - "main"
-  pull_request:
-    branches:
-      - "main"
-  workflow_dispatch:
-
-jobs:
-  build-win:
-    name: Build & Test (Windows)
-    runs-on: windows-2025
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v6
-
-      - name: Setup .NET
-        uses: actions/setup-dotnet@v5
-        with:
-          dotnet-version: |
-            6.0.x
-            8.0.x
-            10.0.x
-
-      - name: Run tests
-        run: dotnet test -c Release -p:CollectCoverage=false
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 267ef49..9388276 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -10,7 +10,10 @@ on:
 jobs:
   build:
     name: Build & Test
-    runs-on: ubuntu-24.04
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest]
 
     steps:
       - name: Checkout
@@ -27,10 +30,16 @@ jobs:
       - name: Build
         run: dotnet build -c Release
 
+      - name: Run tests without Coverage
+        if: startsWith(matrix.os, 'windows')
+        run: dotnet test --no-build -c Release -p:CollectCoverage=false
+
       - name: Run tests with Coverage
+        if: startsWith(matrix.os, 'ubuntu')
         run: dotnet test --no-build -c Release -p:CollectCoverage=true -e:CoverletOutputFormat=opencover
 
       - name: Publish to Codecov
+        if: startsWith(matrix.os, 'ubuntu')
         uses: codecov/codecov-action@v5
         with:
           fail_ci_if_error: true
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4f4b42f..07d4c95 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ jobs:
   pack:
     name: Create NuGet packages
     needs: [build]
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v6
@@ -47,7 +47,7 @@ jobs:
   github:
     name: Deploy to GitHub
     needs: [pack]
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
     steps:
       - name: Download artifacts
         uses: actions/download-artifact@v6
@@ -64,7 +64,7 @@ jobs:
     name: Create GitHub release
     needs: [pack]
     if: startsWith(github.ref, 'refs/tags/v')
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v6
@@ -82,7 +82,7 @@ jobs:
     name: Deploy to NuGet
     needs: [release]
     if: startsWith(github.ref, 'refs/tags/v')
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
     steps:
       - name: Download artifacts
         uses: actions/download-artifact@v6
diff --git a/.github/workflows/labeled.yml b/.github/workflows/labeled.yml
index d1ce076..6d81615 100644
--- a/.github/workflows/labeled.yml
+++ b/.github/workflows/labeled.yml
@@ -13,7 +13,7 @@ permissions:
 jobs:
   automerge:
     name: Enable auto-merge
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
     if: github.actor == 'phnx47-bot' && contains(github.event.pull_request.labels.*.name, 'sync')
     steps:
       - name: Checkout