diff --git a/libraries/build.gradle b/libraries/build.gradle
index 56be4ebb3cf..9ae461a3594 100644
--- a/libraries/build.gradle
+++ b/libraries/build.gradle
@@ -61,6 +61,8 @@ subprojects {
     compileKotlin.compilerJarFile = project.file("${rootDir}/../dist/kotlinc/lib/kotlin-compiler.jar")
     compileTestKotlin.compilerJarFile = project.file("${rootDir}/../dist/kotlinc/lib/kotlin-compiler.jar")
 
+    compileKotlin.kotlinOptions.jdkHome = JDK_16
+
     signing {
         required { project.ext.has('signing.keyId') }
         sign configurations.archives
@@ -81,3 +83,10 @@ subprojects {
         }
     }
 }
+
+static def manifestAttributes(Manifest manifest, Project project, String component) {
+    manifest.attributes \
+        'Kotlin-Runtime-Component': component,
+        'Kotlin-Version': "${project.kotlin_language_version}",
+        'Implementation-Title': "${project.description ?: project.name}"
+}
\ No newline at end of file
diff --git a/libraries/stdlib/build.gradle b/libraries/stdlib/build.gradle
index 8c0dfaa8b56..74a955dfc66 100644
--- a/libraries/stdlib/build.gradle
+++ b/libraries/stdlib/build.gradle
@@ -19,12 +19,7 @@ sourceSets {
 }
 
 jar {
-    manifest {
-        attributes  \
-            'Kotlin-Runtime-Component': 'Core',
-            'Kotlin-Version': "$kotlin_language_version",
-            'Implementation-Title': "${project.description ?: project.name}"
-    }
+    manifestAttributes(manifest, project, 'Core')
 }
 
 artifacts {
diff --git a/libraries/stdlib/jre7/build.gradle b/libraries/stdlib/jre7/build.gradle
index 7f310d0d379..4d9144f1bab 100644
--- a/libraries/stdlib/jre7/build.gradle
+++ b/libraries/stdlib/jre7/build.gradle
@@ -20,12 +20,7 @@ sourceSets {
 }
 
 jar {
-    manifest {
-        attributes \
-            'Kotlin-Runtime-Component': 'Core',
-            'Kotlin-Version': "$kotlin_language_version",
-            'Implementation-Title': "${project.description ?: project.name}"
-    }
+    manifestAttributes(manifest, project, 'Core')
 }
 
 artifacts {
diff --git a/libraries/stdlib/jre8/build.gradle b/libraries/stdlib/jre8/build.gradle
index d7b474436c9..a1185c46284 100644
--- a/libraries/stdlib/jre8/build.gradle
+++ b/libraries/stdlib/jre8/build.gradle
@@ -22,12 +22,7 @@ sourceSets {
 }
 
 jar {
-    manifest {
-        attributes \
-            'Kotlin-Runtime-Component': 'Core',
-            'Kotlin-Version': "$kotlin_language_version",
-            'Implementation-Title': "${project.description ?: project.name}"
-    }
+    manifestAttributes(manifest, project, 'Core')
 }
 
 artifacts {
diff --git a/libraries/tools/runtime/build.gradle b/libraries/tools/runtime/build.gradle
index e332029a7f7..7c60e78191f 100644
--- a/libraries/tools/runtime/build.gradle
+++ b/libraries/tools/runtime/build.gradle
@@ -19,11 +19,7 @@ sourceSets {
 }
 
 jar {
-    manifest {
-        attributes 'Kotlin-Runtime-Component': 'Core',
-                'Kotlin-Version': "$kotlin_language_version",
-                'Implementation-Title': "${project.description ?: project.name}"
-    }
+    manifestAttributes(manifest, project, 'Core')
     from("${rootDir}/../dist/builtins")
 }
 
diff --git a/libraries/tools/script-runtime/build.gradle b/libraries/tools/script-runtime/build.gradle
index 622807f4d62..8e03cc61bab 100644
--- a/libraries/tools/script-runtime/build.gradle
+++ b/libraries/tools/script-runtime/build.gradle
@@ -14,10 +14,7 @@ sourceSets {
 }
 
 jar {
-    manifest {
-        attributes 'Kotlin-Runtime-Component': 'Core',
-            'Implementation-Title': "${project.description ?: project.name}"
-    }
+    manifestAttributes(manifest, project, 'Core')
 }
 
 artifacts {