diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f824990..6ee35bd 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -39,6 +39,9 @@ jobs:
           java-version: 11
           cache: sbt
 
+      - name: Setup sbt
+        uses: sbt/setup-sbt@v1
+
       - name: Check that workflows are up to date
         run: sbt '++ ${{ matrix.scala }}' githubWorkflowCheck
 
diff --git a/.mergify.yml b/.mergify.yml
index 1ea4ebe..9236fe1 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,7 +1,7 @@
 defaults: {}
 queue_rules:
   - name: default
-    conditions: []
+    merge_conditions: []
 pull_request_rules:
   - name: Automatically merge successful Scala Steward PRs
     conditions: