diff --git a/.java-version b/.java-version
index 8e2afd3..b5045cc 100644
--- a/.java-version
+++ b/.java-version
@@ -1 +1 @@
-17
\ No newline at end of file
+21
\ No newline at end of file
diff --git a/generator/build.gradle.kts b/generator/build.gradle.kts
index 14c8a5f..63b4d0e 100644
--- a/generator/build.gradle.kts
+++ b/generator/build.gradle.kts
@@ -1,5 +1,6 @@
 import com.expediagroup.graphql.plugin.gradle.config.GraphQLSerializer
 import com.expediagroup.graphql.plugin.gradle.graphql
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
   alias(libs.plugins.kotlin.jvm)
@@ -8,7 +9,9 @@ plugins {
 }
 
 kotlin {
-  jvmToolchain(17)
+  compilerOptions {
+    jvmTarget.set(JvmTarget.JVM_21)
+  }
 }
 
 dependencies {
diff --git a/library/build.gradle.kts b/library/build.gradle.kts
index 7fe7f7b..d0c2cc7 100644
--- a/library/build.gradle.kts
+++ b/library/build.gradle.kts
@@ -1,6 +1,7 @@
 @file:OptIn(ExperimentalWasmDsl::class)
 
 import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 
 plugins {
@@ -19,12 +20,14 @@ kotlin {
   explicitApi()
 
   applyDefaultHierarchyTemplate()
-
-  jvmToolchain(11)
   jvm {
     testRuns["test"].executionTask.configure {
       useJUnitPlatform()
     }
+    compilerOptions {
+      jvmTarget.set(JvmTarget.JVM_11)
+      freeCompilerArgs.add("-Xjdk-release=11")
+    }
   }
   js(IR) {
     browser()
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 392c8c5..d627e5e 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,9 +1,5 @@
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 
-plugins {
-  id("org.gradle.toolchains.foojay-resolver-convention") version "0.10.0"
-}
-
 @Suppress("UnstableApiUsage")
 dependencyResolutionManagement {
   repositories {