diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 36a8c1c5..101d2b16 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,4 +1,4 @@
-name: 'CI'
+name: "CI"
 
 on:
   push:
@@ -7,7 +7,6 @@ on:
   pull_request:
 
 jobs:
-
   ci:
     needs: [test]
     runs-on: ubuntu-latest
@@ -19,12 +18,11 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        yarncmd: ['test']
+        yarncmd: ["test"]
     steps:
       - uses: actions/checkout@v2
       - name: Configure
         run: |
-          npm config set scripts-prepend-node-path auto
           git config --global user.email uirouter@github.actions
           git config --global user.name uirouter_github_actions
       - name: Install Dependencies
diff --git a/.mergify.yml b/.mergify.yml
index b8c1225d..4fdc7e6a 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,21 +1,27 @@
+queue_rules:
+  - name: default
+    merge_method: squash
+
+  - name: rebase
+    merge_method: rebase
+
 pull_request_rules:
   - name: Auto Squash and Merge
     conditions:
       - base=master
-      - status-success=ci
-      - 'label=ready to squash and merge'
+      - check-success=ci
+      - label=ready to squash and merge
     actions:
-      delete_head_branch: {}
-      merge:
-        method: squash
-        strict: smart
+      queue:
+        name: default
+      delete_head_branch:
+
   - name: Auto Rebase and Merge
     conditions:
       - base=master
-      - status-success=ci
-      - 'label=ready to rebase and merge'
+      - check-success=ci
+      - label=ready to rebase and merge
     actions:
-      delete_head_branch: {}
-      merge:
-        method: rebase
-        strict: smart
+      queue:
+        name: rebase
+      delete_head_branch: