diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index d105d9d1..1f04d480 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -17,10 +17,11 @@ jobs:
       # Fetch all tags so that sbt-dynver can find the previous release version
       - run: git fetch --tags -f
       # Install OpenJDK 8
-      - uses: olafurpg/setup-scala@v10
+      - uses: actions/setup-java@v3
         with:
           # We need to use JDK8 for Android compatibility https://github.com/msgpack/msgpack-java/issues/516
-          java-version: adopt@1.8
+          java-version: 8
+          distribution: adopt
       - name: Setup GPG
         env:
           PGP_SECRET: ${{ secrets.PGP_SECRET }}
diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
index e244adfd..779f3878 100644
--- a/.github/workflows/snapshot.yml
+++ b/.github/workflows/snapshot.yml
@@ -21,9 +21,10 @@ jobs:
           fetch-depth: 10000
       # Fetch all tags so that sbt-dynver can find the previous release version
       - run: git fetch --tags
-      - uses: olafurpg/setup-scala@v10
+      - uses: actions/setup-java@v3
         with:
-          java-version: adopt@1.11
+          java-version: 11
+          distribution: adopt
       - name: Publish snapshots
         env:
           SONATYPE_USERNAME: '${{ secrets.SONATYPE_USER }}'