diff --git a/.mergify.yml b/.mergify.yml
index 95444310..f0391c04 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,14 +1,7 @@
 queue_rules:
   - name: default
-    conditions:
+    queue_conditions:
       - base=master
-      - status-success="validate commits"
-      - status-success="python format"
-      - status-success="python lint"
-      - status-success="jammy - py3.6"
-      - status-success="el8 - py3.6"
-      - status-success="el8 - distcheck"
-      - status-success="coverage"
       - label="merge-when-passing"
       - label!="work-in-progress"
       - or:
@@ -17,11 +10,15 @@ queue_rules:
       - "#approved-reviews-by>0"
       - "#changes-requested-reviews-by=0"
       - -title~=^\[*[Ww][Ii][Pp]
-
-pull_request_rules:
-  - name: default
-    conditions:
+    merge_conditions:
       - base=master
+      - status-success="validate commits"
+      - status-success="python format"
+      - status-success="python lint"
+      - status-success="jammy - py3.6"
+      - status-success="el8 - py3.6"
+      - status-success="el8 - distcheck"
+      - status-success="coverage"
       - label="merge-when-passing"
       - label!="work-in-progress"
       - or:
@@ -30,8 +27,11 @@ pull_request_rules:
       - "#approved-reviews-by>0"
       - "#changes-requested-reviews-by=0"
       - -title~=^\[*[Ww][Ii][Pp]
+    merge_method: merge
+    update_method: rebase
+
+pull_request_rules:
+  - name: refactored queue action rule
+    conditions: []
     actions:
       queue:
-        name: default
-        method: merge
-        update_method: rebase