diff --git a/libraries/build.gradle b/libraries/build.gradle
index 2e3c2bf2cc4..9df2274122b 100644
--- a/libraries/build.gradle
+++ b/libraries/build.gradle
@@ -18,19 +18,22 @@ ext.bootstrapCompilerFile = project.file("${rootDir}/../dist/kotlinc/lib/kotlin-
 ext.compilerPreloaderFile = project.file("${rootDir}/../dist/kotlinc/lib/kotlin-preloader.jar")
 
 allprojects  {
-    apply plugin: 'maven'
-
     group = 'org.jetbrains.kotlin'
     version = "$kotlin_version"
 }
 
 subprojects {
+    apply plugin: 'maven'
     apply plugin: 'signing'
 
     repositories {
         mavenCentral()
     }
 
+    tasks.withType(org.jetbrains.kotlin.gradle.tasks.AbstractKotlinCompile) {
+        compilerJarFile = bootstrapCompilerFile
+    }
+
     signing {
         required { project.ext.has('signing.keyId') }
         sign configurations.archives
@@ -93,11 +96,16 @@ static def commonJvmProjectConfiguration(Project project) {
             from javadoc.destinationDir
         }
 
-        compileKotlin.compilerJarFile = bootstrapCompilerFile
-        compileTestKotlin.compilerJarFile = bootstrapCompilerFile
+        tasks.withType(JavaCompile) {
+            sourceCompatibility = 1.6
+            targetCompatibility = 1.6
+            options.fork = true
+            options.forkOptions.executable = "${JDK_16}/bin/javac"
+        }
 
-        compileKotlin.kotlinOptions.jdkHome = JDK_16
-        compileTestKotlin.kotlinOptions.jdkHome = JDK_16
+        tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
+            kotlinOptions.jdkHome = JDK_16
+        }
 
         test {
             executable = "$JDK_16/bin/java"
diff --git a/libraries/kotlin.test/common/build.gradle b/libraries/kotlin.test/common/build.gradle
index c918cc41053..0b90b1b8300 100644
--- a/libraries/kotlin.test/common/build.gradle
+++ b/libraries/kotlin.test/common/build.gradle
@@ -18,9 +18,6 @@ sourceSets {
 
 // common block
 
-compileKotlinCommon.compilerJarFile = bootstrapCompilerFile
-
-
 
 jar {
     baseName = project.name
diff --git a/libraries/stdlib/build.gradle b/libraries/stdlib/build.gradle
index 34d5b078ef3..eed20d05be6 100644
--- a/libraries/stdlib/build.gradle
+++ b/libraries/stdlib/build.gradle
@@ -48,17 +48,8 @@ artifacts {
     archives javadocJar
 }
 
-[compileJava, compileBuiltinsJava].each { task ->
-    task.sourceCompatibility = 1.6
-    task.targetCompatibility = 1.6
-    task.options.fork = true
-    task.options.forkOptions.executable = "${JDK_16}/bin/javac"
-}
-
 compileBuiltinsKotlin {
-    compilerJarFile = bootstrapCompilerFile
     kotlinOptions {
-        jdkHome = JDK_16
         freeCompilerArgs = [
                 "-version",
                 "-Xallow-kotlin-package",
@@ -70,7 +61,6 @@ compileBuiltinsKotlin {
 }
 compileKotlin {
     kotlinOptions {
-        jdkHome = JDK_16
         freeCompilerArgs = [
                 "-version",
                 "-Xallow-kotlin-package",
diff --git a/libraries/stdlib/common/build.gradle b/libraries/stdlib/common/build.gradle
index b62bc8ff115..cc5a6921a7a 100644
--- a/libraries/stdlib/common/build.gradle
+++ b/libraries/stdlib/common/build.gradle
@@ -33,10 +33,6 @@ compileKotlinCommon {
 }
 */
 
-compileKotlinCommon.compilerJarFile = bootstrapCompilerFile
-
-
-
 jar {
     baseName = project.name
     manifest {
diff --git a/libraries/stdlib/jre7/build.gradle b/libraries/stdlib/jre7/build.gradle
index 5418228b39a..1bfd7e5646f 100644
--- a/libraries/stdlib/jre7/build.gradle
+++ b/libraries/stdlib/jre7/build.gradle
@@ -31,8 +31,12 @@ artifacts {
     archives javadocJar
 }
 
-compileKotlin {
+
+tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
     kotlinOptions.jdkHome = JDK_17
+}
+
+compileKotlin {
     kotlinOptions.freeCompilerArgs = [
             "-Xallow-kotlin-package",
             "-Xmultifile-parts-inherit",
@@ -42,7 +46,6 @@ compileKotlin {
 }
 
 compileTestKotlin {
-    kotlinOptions.jdkHome = JDK_17
     kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package"]
 }
 
diff --git a/libraries/stdlib/jre8/build.gradle b/libraries/stdlib/jre8/build.gradle
index fc579d16fa3..5dcc1e034ba 100644
--- a/libraries/stdlib/jre8/build.gradle
+++ b/libraries/stdlib/jre8/build.gradle
@@ -32,9 +32,12 @@ artifacts {
     archives javadocJar
 }
 
-compileKotlin {
+tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
     kotlinOptions.jdkHome = JDK_18
     kotlinOptions.jvmTarget = 1.8
+}
+
+compileKotlin {
     kotlinOptions.freeCompilerArgs = [
             "-Xallow-kotlin-package",
             "-Xmultifile-parts-inherit",
@@ -44,8 +47,6 @@ compileKotlin {
 }
 
 compileTestKotlin {
-    kotlinOptions.jdkHome = JDK_18
-    kotlinOptions.jvmTarget = 1.8
     kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package"]
 }
 
diff --git a/libraries/tools/runtime/build.gradle b/libraries/tools/runtime/build.gradle
index dbb89e820f6..cb1ca551691 100644
--- a/libraries/tools/runtime/build.gradle
+++ b/libraries/tools/runtime/build.gradle
@@ -35,16 +35,8 @@ artifacts {
     archives javadocJar
 }
 
-compileJava {
-    sourceCompatibility = 1.6
-    targetCompatibility = 1.6
-    options.fork = true
-    options.forkOptions.executable = "${JDK_16}/bin/javac"
-}
-
 compileKotlin {
     kotlinOptions {
-        jdkHome = JDK_16
         freeCompilerArgs = [
                 "-Xallow-kotlin-package",
                 "-Xdump-declarations-to", "${buildDir}/runtime-declarations.json",