diff --git a/.github/mergify.yml b/.github/mergify.yml
index 3d4cb55f..93502fa6 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -1,3 +1,4 @@
+
 pull_request_rules:
   - name: self-assign PRs
     conditions:
@@ -9,18 +10,17 @@ pull_request_rules:
         add_users:
           - "{{ author }}"
   - name: automatic queue when not WIP, CI passes, and at least 1 approving review
-    conditions:
-      - "#approved-reviews-by>=1"
-      - check-success=test (3.10)
-      # - check-success=build-and-push-image
-      - base=main
-      - label!=work-in-progress
+    conditions: []
     actions:
       queue:
-        method: squash
-        name: default
 queue_rules:
   - name: default
-    conditions:
+    queue_conditions:
+      - "#approved-reviews-by>=1"
+      - check-success=test (3.10)
+      - base=main
+      - label!=work-in-progress
+    merge_conditions:
       - check-success=test (3.10)
       # - check-success=build-and-push-image
+    merge_method: squash