diff --git a/.github/mergify.yml b/.github/mergify.yml
index dbc63d44..c42f51d9 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -1,12 +1,9 @@
-defaults:
-  actions:
-    queue:
-      allow_merging_configuration_change: true
-
 queue_rules:
   - name: default
     conditions:
-      - check-success=buildbot/nix-eval
+      - "check-success=buildbot/nix-eval"
+    batch_size: 1
+    batch_max_wait_time: "15 minutes"
 
 pull_request_rules:
   - name: Automerge PRs using the merge queue
@@ -17,9 +14,15 @@ pull_request_rules:
       queue:
         name: default
         method: squash
+        commit_message_template: |
+          {{ title }} (#{{ number }})
+          
+          {{ body }}
+        allow_merging_configuration_change: true
 
   - name: Delete head branch after merge
     conditions:
-      - "merged"
+      - merged
     actions:
-      delete_head_branch: {}
+      delete_head_branch:
+        force: true