diff --git a/.github/mergify.yml b/.github/mergify.yml
index 7449b8f155c..7f94ccba58e 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -1,9 +1,29 @@
 pull_request_rules:
+  # rebase+merge strategy
   - actions:
-      merge:
-        strict: smart+fasttrack
-        method: squash
-    name: Automatically merge pull requests
+      queue:
+        name: default
+        # Merge into master with a merge commit
+        method: merge
+        # Update the pr branch with rebase, so the history is clean
+        update_method: rebase
+    name: Put pull requests in the rebase+merge queue
     conditions:
       - label=merge me
-      - '#approved-reviews-by>=2'
\ No newline at end of file
+      - '#approved-reviews-by>=2'
+  # merge+squash strategy
+  - actions:
+      queue:
+        name: default
+        method: squash
+        # both update methods get absorbed by the squash, so we use the most
+        # reliable
+        update_method: merge
+    name: Put pull requests in the squash+merge queue
+    conditions:
+      - label=squash+merge me
+      - '#approved-reviews-by>=2'
+
+queue_rules:
+  - name: default
+    conditions: []