diff --git a/.mergify.yml b/.mergify.yml
index b1153f0bf7..cb54acbc59 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,11 +1,18 @@
+queue_rules:
+  - name: default
+    conditions:
+      - base=master
+
 pull_request_rules:
   - name: automerge to master with label automerge and branch protection passing
     conditions:
       - "#approved-reviews-by>1"
-      - base=master
       - label=automerge
     actions:
-      merge:
+      queue:
+        name: default
         method: squash
-        strict: true
-        commit_message: title+body
+        commit_message_template: >
+          {{ title }} (#{{ number }})
+          
+          {{ body }}
\ No newline at end of file