diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 318f0b0b..e8124c0c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,20 +13,19 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ '11' ]
-        scala: [
-            { version: '2.12.13' }
-          ]
+        java: [ '8', '11' ]
+
     steps:
       - name: checkout the repo
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
 
-      - name: Set up JDK
-        uses: actions/setup-java@v1
+      - name: Set up JVM
+        uses: actions/setup-java@v2
         with:
+          distribution: 'adopt'
           java-version: ${{ matrix.java }}
 
       - name: run tests
-        run: sbt ++${{ matrix.scala.version }} test scripted
+        run: sbt scripted
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b3204014..3370fc55 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -8,10 +8,13 @@ jobs:
   publish:
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v2.3.4
+      - uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      - uses: olafurpg/setup-scala@v10
+      - uses: actions/setup-java@v2
+        with:
+          distribution: 'adopt'
+          java-version: '11'
       - run: sbt ci-release
         env:
           PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}