diff --git a/.mergify.yml b/.mergify.yml
index 57bab262dd9..e4c2d66ebf3 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -4,10 +4,22 @@ commands_restrictions:
       - or:
           - sender-permission>=write
           - sender=github-actions[bot]
+merge_queue:
+  max_parallel_checks: 1
+
 queue_rules:
   - name: default
+    batch_size: 1
     merge_method: squash
-    conditions:
+    queue_conditions:
+      - check-success=test (macos-latest)
+      - or:
+        - check-success=test (windows-2025)
+        - check-success=test (windows-latest)
+      - check-success=system-test
+      - check-success=lint
+      - check-success=CLA
+    merge_conditions:
       - check-success=test (macos-latest)
       - or:
         - check-success=test (windows-2025)