diff --git a/.github/workflows/merge-queue.yml b/.github/workflows/merge-queue.yml
new file mode 100644
index 0000000000..505e32b358
--- /dev/null
+++ b/.github/workflows/merge-queue.yml
@@ -0,0 +1,17 @@
+name: Merge Queue Checks
+
+on:
+  merge_group:
+    types:
+      - checks_requested
+
+jobs:
+  commitlint:
+    name: Commit Lint
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.sha }}
+
+      - uses: YossiSaadi/commitlint-github-action@vibe-fork/support-merge_group-event
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index c319969be4..0cccad06d1 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -18,3 +18,13 @@ jobs:
     uses: ./.github/workflows/test.yml
     secrets:
       npm_token: ${{ secrets.npm_token }}
+
+  commitlint:
+    name: Commit Lint
+    needs: build
+    if: false
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.sha }}