diff --git a/.github/mergify.yml b/.github/mergify.yml
index 8ec48764..e426911e 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -8,7 +8,7 @@ pull_request_rules:
       assign:
         add_users:
           - "{{ author }}"
-  - name: automatic merge for main when CI passes and 2 reviews and not WIP
+  - name: automatic queue when not WIP, CI passes, and at least 1 approving review
     conditions:
       - "#approved-reviews-by>=1"
       - check-success=test (3.10)
@@ -16,5 +16,11 @@ pull_request_rules:
       - base=main
       - label!=work-in-progress
     actions:
-      merge:
+      queue:
         method: squash
+        name: default
+queue_rules:
+  - name: default
+    conditions:
+      - check-success=test (3.10)
+      - check-success=build-and-push-image