diff --git a/.github/mergify.yml b/.github/mergify.yml
index 7cef0bbc0c..3ad4a14eb7 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -1,9 +1,12 @@
 queue_rules:
   - name: default
-    conditions:
+    queue_conditions:
+      - author~=^dependabot(|-preview)\[bot\]$
+    merge_conditions:
       # Conditions to get out of the queue (= merged)
       - check-success=Run Unit and UI tests
       - check-success=license/cla
+    merge_method: squash
 
 pull_request_rules:
   - name: Automatic approve on dependabot PR
@@ -13,17 +16,13 @@ pull_request_rules:
       review:
         type: APPROVE
 
-  - name: Automatic merge on approval
-    conditions:
-      - author~=^dependabot(|-preview)\[bot\]$
-    actions:
-      queue:
-        method: squash
-        name: default
-
   - name: Thank contributor
     conditions:
       - merged
     actions:
       comment:
-        message: "Thank you @{{author}} for your contribution!"
\ No newline at end of file
+        message: "Thank you @{{author}} for your contribution!"
+  - name: Automatic merge on approval
+    conditions: []
+    actions:
+      queue: