diff --git a/.github/settings.yml b/.github/settings.yml
index df66fd0..6375803 100644
--- a/.github/settings.yml
+++ b/.github/settings.yml
@@ -68,7 +68,7 @@ branches:
       required_pull_request_reviews: null
       required_status_checks:
         strict: false
-        contexts: ['Build & Test']
+        contexts: ['Build & Test (Windows)', 'Build, Test & Pack (Linux)']
       enforce_admins: false
       required_linear_history: false
       restrictions: null
diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
index 420f833..0b4ab08 100644
--- a/.github/workflows/automerge.yml
+++ b/.github/workflows/automerge.yml
@@ -13,7 +13,7 @@ permissions:
 jobs:
   automerge:
     name: Enable auto-merge
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     if: github.actor == 'phnx47-bot' && contains(github.event.pull_request.labels.*.name, 'sync')
     steps:
       - name: Checkout