diff --git a/.mergify.yml b/.mergify.yml
index c30a5f7bf8..8dceebf650 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -34,8 +34,6 @@ pull_request_rules:
         ignore_conflicts: True
         branches:
           - "1.6"
-      queue:
-        update_method: rebase
 
   - name: backport patches to 1.8
     conditions:
@@ -47,5 +45,7 @@ pull_request_rules:
         ignore_conflicts: True
         branches:
           - "1.8"
-      queue:
-        update_method: rebase
+
+queue_rules:
+  - name: merge-queue
+    update_method: rebase