diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 537cc406..31cf9526 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -10,12 +10,15 @@ jobs:
       fail-fast: false
       matrix:
         java: [11, 8]
+        distribution: [adopt]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: olafurpg/setup-scala@v13
+      - uses: actions/setup-java@3
         with:
-          java-version: "adopt@1.${{ matrix.java }}"
+          distribution: "${{ matrix.distribution }}"
+          java-version: "${{ matrix.java }}"
+          cache: sbt
       - run: sbt +testsJVM/test plugin/test
         env:
           GOOGLE_APPLICATION_CREDENTIALS:
@@ -26,7 +29,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: olafurpg/setup-scala@v13
+      - uses: actions/setup-java@3
+        with:
+          distribution: 8
+          java-version: adopt
+          cache: sbt
       - run: sbt +testsJS/test
         env:
           GOOGLE_APPLICATION_CREDENTIALS:
@@ -37,7 +44,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: olafurpg/setup-scala@v13
+      - uses: actions/setup-java@3
+        with:
+          distribution: 8
+          java-version: adopt
+          cache: sbt
       - run: npm install
       - run: sbt +testsJS/test
         env:
@@ -49,7 +60,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: olafurpg/setup-scala@v13
+      - uses: actions/setup-java@3
+        with:
+          distribution: 8
+          java-version: adopt
+          cache: sbt
       - run: sbt +testsNative/test
         env:
           GOOGLE_APPLICATION_CREDENTIALS:
@@ -60,7 +75,11 @@ jobs:
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: olafurpg/setup-scala@v13
+      - uses: actions/setup-java@3
+        with:
+          distribution: 8
+          java-version: adopt
+          cache: sbt
       - run: sbt +testsJVM/test
         shell: bash
         env:
@@ -72,20 +91,32 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: olafurpg/setup-scala@v13
+      - uses: actions/setup-java@3
+        with:
+          distribution: 8
+          java-version: adopt
+          cache: sbt
       - run: sbt mimaReportBinaryIssues
   scalafmt:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: olafurpg/setup-scala@v13
+      - uses: actions/setup-java@3
+        with:
+          distribution: 8
+          java-version: adopt
+          cache: sbt
       - run: ./bin/scalafmt --check
   docs:
     name: Scalafix and Docs
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: olafurpg/setup-scala@v13
+      - uses: actions/setup-java@3
+        with:
+          distribution: 8
+          java-version: adopt
+          cache: sbt
       - run: sbt scalafixCheckAll
       - run: sbt docs/docusaurusCreateSite
         env:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 793aad43..1aa33856 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -8,8 +8,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: olafurpg/setup-scala@v13
-      - uses: olafurpg/setup-gpg@v3
+      - uses: actions/setup-java@3
+        with:
+          distribution: 8
+          java-version: adopt
+          cache: sbt
       - run: git fetch --unshallow
       - name: Publish ${{ github.ref }}
         run: |