diff --git a/.github/workflows/branch-ci.yml b/.github/workflows/branch-ci.yml
index 5c77e8f..9a71c9b 100644
--- a/.github/workflows/branch-ci.yml
+++ b/.github/workflows/branch-ci.yml
@@ -30,14 +30,12 @@ jobs:
           path: ~/.jabba
           key: ${{ runner.os }}-jabba-${{ hashFiles('build.sbt') }}
       - uses: actions/checkout@v2
-      - uses: olafurpg/setup-scala@v10
-        with:
-          java-version: adopt@1.11
       - name: Compile and test
         run: |
-          csbt \
-            'set core / Compile / scalacOptions += "-Werror"' \
-            'set macros / Compile / scalacOptions += "-Werror"' \
+          sbt \
+            'set core.jvm / Compile / scalacOptions += "-Werror"' \
+            'set core.js / Compile / scalacOptions += "-Werror"' \
+            'set macros.jvm / Compile / scalacOptions += "-Werror"' \
+            'set macros.js / Compile / scalacOptions += "-Werror"' \
             compile \
-            test \
-            < /dev/null
+            test
diff --git a/.github/workflows/master-ci.yml b/.github/workflows/master-ci.yml
index b0a369c..b89b54d 100644
--- a/.github/workflows/master-ci.yml
+++ b/.github/workflows/master-ci.yml
@@ -29,14 +29,12 @@ jobs:
           path: ~/.jabba
           key: ${{ runner.os }}-jabba-${{ hashFiles('build.sbt') }}
       - uses: actions/checkout@v2
-      - uses: olafurpg/setup-scala@v10
-        with:
-          java-version: adopt@1.11
       - name: Compile and test
         run: |
-          csbt \
-            'set core / Compile / scalacOptions += "-Werror"' \
-            'set macros / Compile / scalacOptions += "-Werror"' \
+          sbt \
+            'set core.jvm / Compile / scalacOptions += "-Werror"' \
+            'set core.js / Compile / scalacOptions += "-Werror"' \
+            'set macros.jvm / Compile / scalacOptions += "-Werror"' \
+            'set macros.js / Compile / scalacOptions += "-Werror"' \
             compile \
-            test \
-            < /dev/null
+            test