diff --git a/CHANGELOG.md b/CHANGELOG.md
index 11b8182..a02d7ec 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 ### Changed
 
 - Gradle - upgrade `org.gradle.toolchains.foojay-resolver-convention` to `0.8.0`
+- Gradle - cleanup the `jvmToolchain` setup
 
 ### Fixed
 
diff --git a/build.gradle.kts b/build.gradle.kts
index c5e5958..c745262 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -26,13 +26,9 @@ dependencies {
 //    implementation(libs.annotations)
 }
 
-// Set the JVM language level used to build the project. Use Java 11 for 2020.3+, and Java 17 for 2022.2+.
+// Set the JVM language level used to build the project.
 kotlin {
-    @Suppress("UnstableApiUsage")
-    jvmToolchain {
-        languageVersion = JavaLanguageVersion.of(17)
-        vendor = JvmVendorSpec.JETBRAINS
-    }
+    jvmToolchain(17)
 }
 
 // Configure Gradle IntelliJ Plugin - read more: https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html