diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index b93cedc..6db28e3 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -8,10 +8,11 @@ on:
       - 'AUDIT-*.md'
       - '.claude/**'
       - 'LICENSE'
+  merge_group:
 
 concurrency:
   group: ci-${{ github.ref }}
-  cancel-in-progress: true
+  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
 
 permissions:
   contents: read