diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3195140f..423f3b87 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -11,9 +11,11 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - uses: olafurpg/setup-scala@v14
+    - uses: actions/setup-java@v4
       with:
         java-version: 8
+        distribution: adopt
+    - uses: sbt/setup-sbt@v1
     - name: Mount caches
       uses: actions/cache@v2
       with:
@@ -47,9 +49,11 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - uses: olafurpg/setup-scala@v14
+    - uses: actions/setup-java@v4
       with:
         java-version: 11
+        distribution: adopt
+    - uses: sbt/setup-sbt@v1
     - name: Mount caches
       uses: actions/cache@v2
       with:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 4ac250a4..7b7690d0 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -18,9 +18,11 @@ jobs:
           ~/.ivy2/cache
           ~/.cache/coursier
         key: ${{ runner.os }}-sbt-docs-${{ hashFiles('**/*.sbt') }}
-    - uses: actions/setup-java@v1
+    - uses: actions/setup-java@v4
       with:
         java-version: 8
+        distribution: adopt
+    - uses: sbt/setup-sbt@v1
     - name: Publish ${{ github.ref }}
       run: sbt ci-release
       env: