diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index 219810e..7de3a16 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -11,7 +11,12 @@ on:
       - published
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  # Each push to main gets its own group, so merges never cancel each other
+  # and main keeps a complete CI record. All other events keep the per-ref
+  # group and still supersede older runs.
+  group: >-
+    ${{ github.workflow }}-${{ github.event_name == 'push' && github.sha ||
+    github.ref }}
   cancel-in-progress: true
 
 env:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 93fdcc1..57cf424 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -11,7 +11,12 @@ on:
       - main
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  # Each push to main gets its own group, so merges never cancel each other
+  # and main keeps a complete CI record. All other events keep the per-ref
+  # group and still supersede older runs.
+  group: >-
+    ${{ github.workflow }}-${{ github.event_name == 'push' && github.sha ||
+    github.ref }}
   cancel-in-progress: true
 
 env: