diff --git a/.mergify.yml b/.mergify.yml
index 9182710..5aa028f 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,8 +1,13 @@
 queue_rules:
   - name: default
-    conditions:
+    queue_conditions:
+      - base=master
+      - author=scala-steward
+      - check-success~=build
+    merge_conditions:
       # Conditions to get out of the queue (= merged)
       - check-success~=build
+    merge_method: squash
 
 pull_request_rules:
   - name: assign and label scala-steward's PRs
@@ -12,11 +17,6 @@ pull_request_rules:
       label:
         add: [dependency-update]
   - name: merge scala-steward's PRs
-    conditions:
-      - base=master
-      - author=scala-steward
-      - check-success~=build
+    conditions: []
     actions:
       queue:
-        name: default
-        method: squash