diff --git a/.github/mergify.yml b/.github/mergify.yml
index 4a1efe926a8..7e4a6e0b06f 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -19,8 +19,8 @@ pull_request_rules:
   - actions:
       queue:
         name: default
-        # Merge into master with a merge commit
-        method: merge
+        # Merge into master with a rebase
+        method: rebase
         # Update the pr branch with rebase, so the history is clean
         update_method: rebase
     name: Put pull requests in the rebase+merge queue
@@ -60,8 +60,8 @@ pull_request_rules:
   - actions:
       queue:
         name: default
-        # Merge with a merge commit
-        method: merge
+        # Merge with a rebase
+        method: rebase
         # Update the pr branch with rebase, so the history is clean
         update_method: rebase
     name: Put backports in the rebase+merge queue