diff --git a/.mergify.yml b/.mergify.yml
index b8c1225..5ad1aae 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,21 +1,27 @@
+queue_rules:
+  - name: default
+    merge_method: squash
+
+  - name: rebase
+    merge_method: rebase
+
 pull_request_rules:
   - name: Auto Squash and Merge
     conditions:
       - base=master
-      - status-success=ci
+      - check-success=ci
       - 'label=ready to squash and merge'
     actions:
       delete_head_branch: {}
-      merge:
-        method: squash
-        strict: smart
+      queue:
+        name: default
+
   - name: Auto Rebase and Merge
     conditions:
       - base=master
-      - status-success=ci
+      - check-success=ci
       - 'label=ready to rebase and merge'
     actions:
       delete_head_branch: {}
-      merge:
-        method: rebase
-        strict: smart
+      queue:
+        name: rebase