diff --git a/.mergify.yml b/.mergify.yml
index 2e60ba299..edb9220bc 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,7 +1,10 @@
 queue_rules:
   - name: default
-    conditions:
+    queue_conditions:
+      - "-merged"
       - "#approved-reviews-by>=1"
+      - base=main
+      - label=AUTOMERGE-REQUESTED
       - status-success=Docs
       - status-success=Lint
       - status-success=Python (3.9, macos-latest)
@@ -11,13 +14,8 @@ queue_rules:
       - status-success=Python (3.9, windows-latest)
       - status-success=Python (3.12, windows-latest)
       - "status-success=ci/circleci: build"
-pull_request_rules:
-  - name: Automatic rebase, CI and merge
-    conditions:
-      - "-merged"
+    merge_conditions:
       - "#approved-reviews-by>=1"
-      - base=main
-      - label=AUTOMERGE-REQUESTED
       - status-success=Docs
       - status-success=Lint
       - status-success=Python (3.9, macos-latest)
@@ -27,16 +25,10 @@ pull_request_rules:
       - status-success=Python (3.9, windows-latest)
       - status-success=Python (3.12, windows-latest)
       - "status-success=ci/circleci: build"
-      #- status-success=codecov/patch
-      #- status-success=codecov/project/c-tests
-      #- status-success=codecov/project/python-c-tests
-      #- status-success=codecov/project/python-tests
-    actions:
-      queue:
-        name: default
-        method: rebase
-        update_method: rebase
+    merge_method: rebase
+    update_method: rebase
 
+pull_request_rules:
   - name: Remove label after merge
     conditions:
       - merged
@@ -45,3 +37,7 @@ pull_request_rules:
       label:
         remove:
           - AUTOMERGE-REQUESTED
+  - name: refactored queue action rule
+    conditions: []
+    actions:
+      queue: