diff --git a/.mergify.yml b/.mergify.yml
index 6af76c40..05117b3c 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -8,14 +8,12 @@ queue_rules:
       - -label~=(do-not-merge)
       - status-success=build
     merge_method: squash
-    commit_message_template: |-
-      {{ title }} (#{{ number }})
-
-      {{ body }}
+    commit_message_format:
+      title: pr-title
+      body: pr-body
 pull_request_rules:
   - name: Automatic merge on approval and successful build
     actions:
-      delete_head_branch: {}
       queue:
         name: default
     conditions: