diff --git a/buildSrc/src/main/kotlin/buildsrc/convention/kotlin-multiplatform.gradle.kts b/buildSrc/src/main/kotlin/buildsrc/convention/kotlin-multiplatform.gradle.kts
index e1fba20e7..aaa58c784 100644
--- a/buildSrc/src/main/kotlin/buildsrc/convention/kotlin-multiplatform.gradle.kts
+++ b/buildSrc/src/main/kotlin/buildsrc/convention/kotlin-multiplatform.gradle.kts
@@ -22,11 +22,6 @@ kotlin {
         }
     }
     targets.withType<KotlinJvmTarget>().configureEach {
-        compilations.configureEach {
-            kotlinOptions {
-                jvmTarget = Deps.Versions.jvmTarget.toString()
-            }
-        }
         testRuns["test"].executionTask.configure {
             useJUnitPlatform()
         }
diff --git a/buildSrc/src/main/kotlin/buildsrc/convention/toolchain-jvm.gradle.kts b/buildSrc/src/main/kotlin/buildsrc/convention/toolchain-jvm.gradle.kts
index c717708e6..40a0952af 100644
--- a/buildSrc/src/main/kotlin/buildsrc/convention/toolchain-jvm.gradle.kts
+++ b/buildSrc/src/main/kotlin/buildsrc/convention/toolchain-jvm.gradle.kts
@@ -1,12 +1,26 @@
 package buildsrc.convention
 
+import buildsrc.config.Deps
 import org.jetbrains.kotlin.gradle.plugin.KotlinBasePlugin
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import org.jetbrains.kotlin.gradle.tasks.UsesKotlinJavaToolchain
 
 
 description = "Set JavaToolchain for compiling main and test code"
 
 
+tasks.withType<JavaCompile>().configureEach {
+    options.encoding = "UTF-8"
+    sourceCompatibility = Deps.Versions.jvmTarget.toString()
+    targetCompatibility = Deps.Versions.jvmTarget.toString()
+}
+
+tasks.withType<KotlinCompile>().configureEach {
+    kotlinOptions {
+        jvmTarget = Deps.Versions.jvmTarget.toString()
+    }
+}
+
 // Retrieve the JavaToolchainService extension
 val javaToolchains: JavaToolchainService = extensions.getByType()