diff --git a/.github/mergify.yml b/.github/mergify.yml
index e4759144a9..f4dcb23635 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -1,9 +1,15 @@
+queue_rules:
+  - name: default
+    # Mergify always respects the branch protection settings
+    # so we can left empty mergify own ones
+    conditions: []
+
 pull_request_rules:
-  - actions:
-      merge:
-        strict: smart+fasttrack
-        method: squash
-    name: Automatically merge pull requests
+  - name: Automatically merge pull requests
     conditions:
       - label=merge me
       - '#approved-reviews-by>=1'
+    actions:
+      queue:
+        method: squash
+        name: default