diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f17f86b0..71838e93 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -11,9 +11,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v1
-    - uses: olafurpg/setup-scala@v10
+    - uses: actions/setup-java@v3
       with:
         java-version: 8
+        distribution: adopt
     - name: Mount caches
       uses: actions/cache@v2
       with:
@@ -47,9 +48,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v1
-    - uses: olafurpg/setup-scala@v10
+    - uses: actions/setup-java@v3
       with:
         java-version: 11
+        distribution: adopt
     - name: Mount caches
       uses: actions/cache@v2
       with:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 5b3c30f2..4f6d01a9 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -18,9 +18,10 @@ jobs:
           ~/.ivy2/cache
           ~/.cache/coursier
         key: ${{ runner.os }}-sbt-docs-${{ hashFiles('**/*.sbt') }}
-    - uses: actions/setup-java@v1
+    - uses: actions/setup-java@v3
       with:
         java-version: 8
+        distribution: adopt
     - name: Publish ${{ github.ref }}
       run: sbt ci-release
       env: