diff --git a/.github/workflows/clang-format.yml b/.github/workflows/clang-format.yml
index 4684d8ad1f..bb2cca1880 100644
--- a/.github/workflows/clang-format.yml
+++ b/.github/workflows/clang-format.yml
@@ -7,6 +7,7 @@ on:
   workflow_call:
   workflow_dispatch:
   pull_request:
+  merge_group:
 
 env:
   BUN_VERSION: "1.1.27"
diff --git a/.github/workflows/clang-tidy.yml b/.github/workflows/clang-tidy.yml
index 1f1aa1404d..a6f06ad620 100644
--- a/.github/workflows/clang-tidy.yml
+++ b/.github/workflows/clang-tidy.yml
@@ -7,6 +7,7 @@ on:
   workflow_call:
   workflow_dispatch:
   pull_request:
+  merge_group:
 
 env:
   BUN_VERSION: "1.1.27"
diff --git a/.github/workflows/prettier-format.yml b/.github/workflows/prettier-format.yml
index 9f2f6110c4..43a407443e 100644
--- a/.github/workflows/prettier-format.yml
+++ b/.github/workflows/prettier-format.yml
@@ -7,6 +7,7 @@ on:
   workflow_call:
   workflow_dispatch:
   pull_request:
+  merge_group:
 
 env:
   BUN_VERSION: "1.1.27"
diff --git a/.github/workflows/zig-format.yml b/.github/workflows/zig-format.yml
index 5dcfb0eff5..24d5577ad7 100644
--- a/.github/workflows/zig-format.yml
+++ b/.github/workflows/zig-format.yml
@@ -7,6 +7,7 @@ on:
   workflow_call:
   workflow_dispatch:
   pull_request:
+  merge_group:
 
 env:
   BUN_VERSION: "1.1.27"
diff --git a/scripts/build.mjs b/scripts/build.mjs
index b620d7964f..a35c21eac3 100644
--- a/scripts/build.mjs
+++ b/scripts/build.mjs
@@ -130,7 +130,10 @@ function getCachePath(branch) {
   const repository = process.env.BUILDKITE_REPO;
   const fork = process.env.BUILDKITE_PULL_REQUEST_REPO;
   const repositoryKey = (fork || repository).replace(/[^a-z0-9]/gi, "-");
-  const branchKey = (branch || process.env.BUILDKITE_BRANCH).replace(/[^a-z0-9]/gi, "-");
+  const branchName = (branch || process.env.BUILDKITE_BRANCH).replace(/[^a-z0-9]/gi, "-");
+  const branchKey = branchName.startsWith("gh-readonly-queue-")
+    ? branchName.slice(18, branchName.indexOf("-pr-"))
+    : branchName;
   const stepKey = process.env.BUILDKITE_STEP_KEY.replace(/[^a-z0-9]/gi, "-");
   return resolve(buildPath, "..", "cache", repositoryKey, branchKey, stepKey);
 }