diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e62234b..72e4c46 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -23,7 +23,7 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         scala: [2.12.19]
-        java: [temurin@8]
+        java: [zulu@8]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout current branch (full)
@@ -31,14 +31,17 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Setup Java (temurin@8)
-        if: matrix.java == 'temurin@8'
+      - name: Setup Java (zulu@8)
+        if: matrix.java == 'zulu@8'
         uses: actions/setup-java@v4
         with:
-          distribution: temurin
+          distribution: zulu
           java-version: 8
           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 3a47fa7..3fc318d 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:
@@ -9,7 +9,7 @@ pull_request_rules:
           - author=scala-steward
           - author=slick-scala-steward[bot]
           - author=renovate[bot]
-      - check-success=Build and Test (ubuntu-latest, 2.12.19, temurin@8)
+      - check-success=Build and Test (ubuntu-latest, 2.12.19, zulu@8)
     actions:
         queue:
             name: default