diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 7e1d68e..a8990fd 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -2,8 +2,6 @@ name: Continuous Integration
 
 on:
   workflow_call:
-  pull_request:
-    branches: ['*']
   push:
     branches: ['*']
 
@@ -11,8 +9,8 @@ env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
 jobs:
-  build:
-    name: Build and Test
+  build-legacy:
+    name: Build and Test on legacy JDK and Spark
     runs-on: ubuntu-latest
     steps:
       - name: Checkout current branch (full)
@@ -23,7 +21,21 @@ jobs:
       - uses: coursier/setup-action@v1
         with:
           jvm: adopt:1.8
+      - name: Build, test, and package project on "legacy" Spark
+        run: bin/sbt clean compile test package makePom
+  build-modern:
+    name: Build and Test on Modern JDK and Spark
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout current branch (full)
+        uses: actions/checkout@v4
+      - uses: coursier/cache-action@v6
+        with:
+          extraKey: ${{ runner.os }}
+      - uses: coursier/setup-action@v1
+        with:
+          jvm: adoptium:1.17
       - name: Build, test, and package project on Spark 3.5
         run: bin/sbt clean compile test package makePom -DsparkVersion=3.5.1
-      - name: Build and package project on "legacy" Spark
-        run: bin/sbt clean compile package makePom
+        env:
+          MODERN_JAVA: TRUE
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 4c6c21c..4b7c280 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -10,7 +10,7 @@ env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
 jobs:
-  deploy:
+  deploy-legacy:
     name: Release
     runs-on: ubuntu-latest
     steps:
@@ -23,7 +23,21 @@ jobs:
         with:
           jvm: adopt:1.8
       # uses sbt-github-packages, see build.sbt
-      - name: Publish with SBT
+      - name: Publish for Spark 2 / Scala 2.11 with SBT
         run: bin/sbt publish
-      - name: Publish with SBT
+  deploy-modern:
+    name: Release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout current branch (full)
+        uses: actions/checkout@v4
+      - uses: coursier/cache-action@v6
+        with:
+          extraKey: ${{ runner.os }}
+      - uses: coursier/setup-action@v1
+        with:
+          jvm: adoptium:1.17
+      - name: Publish for Spark 3 / Scala 2.12 with SBT
         run: bin/sbt publish -DsparkVersion=3.5.1
+        env:
+          MODERN_JAVA: TRUE
diff --git a/.github/workflows/scala-steward.yaml b/.github/workflows/scala-steward.yaml
index 92d8c41..410cf0a 100644
--- a/.github/workflows/scala-steward.yaml
+++ b/.github/workflows/scala-steward.yaml
@@ -24,7 +24,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '11'
+          java-version: '17'
       - name: Launch Scala Steward
         uses: scala-steward-org/scala-steward-action@v2
         with: