diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ff697b5b..9be74b60 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -13,7 +13,7 @@ jobs:
 
     strategy:
       matrix:
-        java_version: [11, 17, 21]
+        java_version: [11, 17, 22]
         test_config_method: ["DSL", "PROPERTIES", "BASE"]
 
     steps:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index db93e321..4e5d0a0b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,9 +10,9 @@
 - Kotlin Gradle Plugin 1.9.20
 
 #### Compatibility tested up to
-- JDK 21
+- JDK 22
 - Gradle 8.7
-- Gradle 8.8-rc-1g
+- Gradle 8.8-rc-1
 - Android Gradle Plugin 8.3.2
 - Android Gradle Plugin 8.4.0-rc02
 - Android Gradle Plugin 8.5.0-alpha05
diff --git a/plugin/src/integrationTest/kotlin/com/vanniktech/maven/publish/TestOptions.kt b/plugin/src/integrationTest/kotlin/com/vanniktech/maven/publish/TestOptions.kt
index 7633d1d2..33138d07 100644
--- a/plugin/src/integrationTest/kotlin/com/vanniktech/maven/publish/TestOptions.kt
+++ b/plugin/src/integrationTest/kotlin/com/vanniktech/maven/publish/TestOptions.kt
@@ -78,6 +78,7 @@ enum class GradleVersion(
   // stable
   GRADLE_8_7(
     value = "8.7",
+    firstUnsupportedJdkVersion = JavaVersion.VERSION_22,
   ),
 
   // rc