diff --git a/.mergify.yml b/.mergify.yml
index 9b11546..648c1c6 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,7 +1,10 @@
 queue_rules:
   - name: default
-    conditions:
-      # Conditions to get out of the queue (= merged)
+    queue_conditions:
+      - label!=no-mergify
+      - -draft
+      - approved-reviews-by=@fedora-infra/fedora-infrastructure-developers
+      - "#changes-requested-reviews-by=0"
       - check-success=Misc tests (lint)
       - check-success=Misc tests (format)
       - check-success=Misc tests (security)
@@ -10,20 +13,8 @@ queue_rules:
       - check-success=Unit tests (py39)
       - check-success=Unit tests (py310)
       - check-success=Unit tests (flask1)
-
-
-pull_request_rules:
-
-  - name: Merge on approval
-    actions:
-      queue:
-        name: default
-        method: rebase
-    conditions:
-      - label!=no-mergify
-      - -draft
-      - approved-reviews-by=@fedora-infra/fedora-infrastructure-developers
-      - "#changes-requested-reviews-by=0"
+    merge_conditions:
+      # Conditions to get out of the queue (= merged)
       - check-success=Misc tests (lint)
       - check-success=Misc tests (format)
       - check-success=Misc tests (security)
@@ -32,11 +23,10 @@ pull_request_rules:
       - check-success=Unit tests (py39)
       - check-success=Unit tests (py310)
       - check-success=Unit tests (flask1)
+    merge_method: rebase
 
+pull_request_rules:
 
-  # Pre-commit autoupdates. Don't expect the CI to have run for this one:
-  # https://docs.github.com/en/actions/learn-github-actions/events-that-trigger-workflows#triggering-new-workflows-using-a-personal-access-token
-  # In the workflow, we do a pre-commit run before creating the PR.
   - name: Merge pre-commit autoupdates
     actions:
       merge:
@@ -47,3 +37,7 @@ pull_request_rules:
       - author=github-actions[bot]
       - title=Auto-update pre-commit hooks
       - "#changes-requested-reviews-by=0"
+  - name: refactored queue action rule
+    conditions: []
+    actions:
+      queue: