diff --git a/.java-version b/.java-version
index 9d607966..b5045cc4 100644
--- a/.java-version
+++ b/.java-version
@@ -1 +1 @@
-11
\ No newline at end of file
+21
\ No newline at end of file
diff --git a/benchmark/build.gradle.kts b/benchmark/build.gradle.kts
index c105be50..1650415b 100644
--- a/benchmark/build.gradle.kts
+++ b/benchmark/build.gradle.kts
@@ -1,5 +1,6 @@
 plugins {
   convention.kotlin
+  convention.`multiplatform-jvm`
   alias(libs.plugins.kotlin.benchmark)
   alias(libs.plugins.kotlin.allopen)
 }
diff --git a/buildSrc/src/main/kotlin/convention.kotlin.gradle.kts b/buildSrc/src/main/kotlin/convention.kotlin.gradle.kts
index 66f0a62c..25423093 100644
--- a/buildSrc/src/main/kotlin/convention.kotlin.gradle.kts
+++ b/buildSrc/src/main/kotlin/convention.kotlin.gradle.kts
@@ -3,5 +3,4 @@ plugins {
 }
 
 kotlin {
-  jvmToolchain(11)
 }
\ No newline at end of file
diff --git a/buildSrc/src/main/kotlin/convention.multiplatform-jvm.gradle.kts b/buildSrc/src/main/kotlin/convention.multiplatform-jvm.gradle.kts
new file mode 100644
index 00000000..1270583f
--- /dev/null
+++ b/buildSrc/src/main/kotlin/convention.multiplatform-jvm.gradle.kts
@@ -0,0 +1,17 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
+plugins {
+  id("convention.kotlin")
+}
+
+kotlin {
+  jvm {
+    testRuns["test"].executionTask.configure {
+      useJUnitPlatform()
+    }
+    compilerOptions {
+      jvmTarget.set(JvmTarget.JVM_11)
+      freeCompilerArgs.add("-Xjdk-release=11")
+    }
+  }
+}
\ No newline at end of file
diff --git a/buildSrc/src/main/kotlin/convention.mutliplatform-lib.gradle.kts b/buildSrc/src/main/kotlin/convention.multiplatform-lib.gradle.kts
similarity index 86%
rename from buildSrc/src/main/kotlin/convention.mutliplatform-lib.gradle.kts
rename to buildSrc/src/main/kotlin/convention.multiplatform-lib.gradle.kts
index e2cf29a9..14e7751c 100644
--- a/buildSrc/src/main/kotlin/convention.mutliplatform-lib.gradle.kts
+++ b/buildSrc/src/main/kotlin/convention.multiplatform-lib.gradle.kts
@@ -2,16 +2,13 @@ import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 
 plugins {
   id("convention.kotlin")
+  id("convention.multiplatform-jvm")
 }
 
 kotlin {
   explicitApi()
 
-  jvm {
-    testRuns["test"].executionTask.configure {
-      useJUnitPlatform()
-    }
-  }
+  jvm()
   js(IR) {
     browser()
     generateTypeScriptDefinitions()
diff --git a/buildSrc/src/main/kotlin/convention.mutliplatform-tests.gradle.kts b/buildSrc/src/main/kotlin/convention.multiplatform-tests.gradle.kts
similarity index 100%
rename from buildSrc/src/main/kotlin/convention.mutliplatform-tests.gradle.kts
rename to buildSrc/src/main/kotlin/convention.multiplatform-tests.gradle.kts
diff --git a/json-schema-validator-objects/build.gradle.kts b/json-schema-validator-objects/build.gradle.kts
index 5b895fbb..9e2dd5b5 100644
--- a/json-schema-validator-objects/build.gradle.kts
+++ b/json-schema-validator-objects/build.gradle.kts
@@ -7,8 +7,8 @@ import org.jlleitschuh.gradle.ktlint.reporter.ReporterType
 
 plugins {
   convention.kotlin
-  convention.`mutliplatform-lib`
-  convention.`mutliplatform-tests`
+  convention.`multiplatform-lib`
+  convention.`multiplatform-tests`
   alias(libs.plugins.kotlin.serialization)
   alias(libs.plugins.kotest.multiplatform)
   alias(libs.plugins.kover)
diff --git a/json-schema-validator/build.gradle.kts b/json-schema-validator/build.gradle.kts
index bff57a4f..4692468e 100644
--- a/json-schema-validator/build.gradle.kts
+++ b/json-schema-validator/build.gradle.kts
@@ -7,8 +7,8 @@ import org.jlleitschuh.gradle.ktlint.reporter.ReporterType
 
 plugins {
   convention.kotlin
-  convention.`mutliplatform-lib`
-  convention.`mutliplatform-tests`
+  convention.`multiplatform-lib`
+  convention.`multiplatform-tests`
   alias(libs.plugins.kotlin.serialization)
   alias(libs.plugins.kotest.multiplatform)
   alias(libs.plugins.kover)
diff --git a/test-suites/build.gradle.kts b/test-suites/build.gradle.kts
index 62ed74e9..bc2f5f6f 100644
--- a/test-suites/build.gradle.kts
+++ b/test-suites/build.gradle.kts
@@ -7,7 +7,8 @@ import tasks.GenerateRemoteSchemas
 
 plugins {
   convention.kotlin
-  convention.`mutliplatform-tests`
+  convention.`multiplatform-jvm`
+  convention.`multiplatform-tests`
   alias(libs.plugins.kotlin.serialization)
   alias(libs.plugins.kotest.multiplatform)
   alias(libs.plugins.kover)
@@ -18,11 +19,7 @@ plugins {
 kotlin {
   explicitApi()
 
-  jvm {
-    testRuns["test"].executionTask.configure {
-      useJUnitPlatform()
-    }
-  }
+  jvm()
   js(IR) {
     nodejs()
   }