diff --git a/.mergify.yml b/.mergify.yml
index 85ecd54bc..19dc8b0be 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,6 +1,8 @@
 queue_rules:
   - name: default
-    conditions:
+    queue_conditions:
+      - author=dependabot[bot]
+      - '#changes-requested-reviews-by=0'
       - 'status-success=Vercel – operation-code'
       - 'status-success=Vercel – storybook'
       - 'status-success=ci/circleci: lint'
@@ -8,12 +10,7 @@ queue_rules:
       - 'status-success=cypress: all tests'
       - status-success=codeclimate/diff-coverage
       - status-success=codeclimate/total-coverage
-
-pull_request_rules:
-  - name: Auto-merge successful Dependabot upgrades
-    conditions:
-      - author=dependabot[bot]
-      - '#changes-requested-reviews-by=0'
+    merge_conditions:
       - 'status-success=Vercel – operation-code'
       - 'status-success=Vercel – storybook'
       - 'status-success=ci/circleci: lint'
@@ -21,7 +18,10 @@ pull_request_rules:
       - 'status-success=cypress: all tests'
       - status-success=codeclimate/diff-coverage
       - status-success=codeclimate/total-coverage
+    merge_method: rebase
+
+pull_request_rules:
+  - name: refactored queue action rule
+    conditions: []
     actions:
       queue:
-        method: rebase
-        name: default