diff --git a/.mergify.yml b/.mergify.yml
index d202dd0ae..a6bb60153 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,29 +1,32 @@
 queue_rules:
-  - name: main
-    conditions:
+  - name: duplicated main from merge to master
+    queue_conditions:
+      - label=automerge:merge
+    merge_conditions:
       - base=main
       # Require integration tests before merging only
       - check-success=Cloudflare Pages
-pull_request_rules:
-  - name: merge to master
-    conditions:
-      - label=automerge:merge
-    actions:
-      queue:
-        name: main
-        method: merge
-  - name: rebase updates then merge to master
-    conditions:
+    merge_method: merge
+  - name: duplicated main from rebase updates then merge to master
+    queue_conditions:
       - label=automerge:rebase
-    actions:
-      queue:
-        name: main
-        method: merge
-        update_method: rebase
-  - name: squash to master
-    conditions:
+    merge_conditions:
+      - base=main
+      # Require integration tests before merging only
+      - check-success=Cloudflare Pages
+    update_method: rebase
+    merge_method: merge
+  - name: duplicated main from squash to master
+    queue_conditions:
       - label=automerge:squash
+    merge_conditions:
+      - base=main
+      # Require integration tests before merging only
+      - check-success=Cloudflare Pages
+    merge_method: squash
+
+pull_request_rules:
+  - name: merge to master + rebase updates then merge to master + squash to master
+    conditions: []
     actions:
       queue:
-        name: main
-        method: squash