diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c6702ca..ba5aff2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -10,8 +10,6 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java-version:
-          - 16
         use-ksp: [ true, false ]
 
     steps:
@@ -27,19 +25,19 @@ jobs:
       - uses: actions/cache@v2
         with:
           path: ~/.gradle/caches
-          key: ${{ runner.os }}-gradle-${{ matrix.java-version }}-${{ hashFiles('checksum.txt') }}
+          key: ${{ runner.os }}-gradle-${{ hashFiles('checksum.txt') }}
           restore-keys: |
-            ${{ runner.os }}-gradle-${{ matrix.java-version }}-
+            ${{ runner.os }}-gradle-
 
       - name: Configure JDK
         uses: actions/setup-java@v2
         with:
           distribution: 'zulu'
-          java-version: ${{ matrix.java-version }}
+          java-version: '17'
 
       - name: Test
         run: ./gradlew build check --stacktrace -PuseKsp=${{ matrix.use-ksp }}
 
       - name: Publish (default branch only)
-        if: github.repository == 'square/moshi' && github.ref == 'refs/heads/master' && matrix.java-version == '16'
+        if: github.repository == 'square/moshi' && github.ref == 'refs/heads/master'
         run: ./gradlew publish -PmavenCentralUsername=${{ secrets.SONATYPE_NEXUS_USERNAME }} -PmavenCentralPassword=${{ secrets.SONATYPE_NEXUS_PASSWORD }}
diff --git a/build.gradle.kts b/build.gradle.kts
index 8e396d9..01a9070 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -112,7 +112,7 @@ subprojects {
   pluginManager.withPlugin("java") {
     configure<JavaPluginExtension> {
       toolchain {
-        languageVersion.set(JavaLanguageVersion.of(16))
+        languageVersion.set(JavaLanguageVersion.of(17))
       }
     }
     if (project.name != "records-tests") {
diff --git a/moshi/build.gradle.kts b/moshi/build.gradle.kts
index dbba809..a89e79b 100644
--- a/moshi/build.gradle.kts
+++ b/moshi/build.gradle.kts
@@ -29,9 +29,10 @@ val java16 by sourceSets.creating {
 }
 
 tasks.named<JavaCompile>("compileJava16Java") {
+  // We use JDK 17 for latest but target 16 for maximum compatibility
   javaCompiler.set(
     javaToolchains.compilerFor {
-      languageVersion.set(JavaLanguageVersion.of(16))
+      languageVersion.set(JavaLanguageVersion.of(17))
     }
   )
   options.release.set(16)
diff --git a/moshi/records-tests/build.gradle.kts b/moshi/records-tests/build.gradle.kts
index 9d01a8d..e60e4a2 100644
--- a/moshi/records-tests/build.gradle.kts
+++ b/moshi/records-tests/build.gradle.kts
@@ -18,7 +18,14 @@ plugins {
   `java-library`
 }
 
+java {
+  toolchain {
+    languageVersion.set(JavaLanguageVersion.of(17))
+  }
+}
+
 tasks.withType<JavaCompile>().configureEach {
+  // Target 16 to ensure minimum compatibility
   options.release.set(16)
 }