diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTargetConfigurator.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTargetConfigurator.kt
index c0182eff5db..5bc5728ed24 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTargetConfigurator.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTargetConfigurator.kt
@@ -392,6 +392,11 @@ open class KotlinNativeTargetConfigurator<T : KotlinNativeTarget> : AbstractKotl
 
                 it.destinationDirectory.set(project.klibOutputDirectory(compilationInfo).resolve("klib"))
                 it.compilerOptions.moduleName.set(project.klibModuleName(it.baseName))
+                val propertiesProvider = PropertiesProvider(project)
+                if (propertiesProvider.useK2 == true) {
+                    it.compilerOptions.useK2.set(true)
+                }
+                it.compilerOptions.useK2.disallowChanges()
             }
 
             compilationInfo.classesDirs.from(compileTaskProvider.map { it.outputFile })
diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/NativeCompilerOptions.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/NativeCompilerOptions.kt
index a6d4bf3be53..122c6bf4ce0 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/NativeCompilerOptions.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/NativeCompilerOptions.kt
@@ -17,9 +17,6 @@ class NativeCompilerOptions(project: Project) : HasCompilerOptions<KotlinCommonC
 
     override val options: KotlinNativeCompilerOptions = project.objects
         .newInstance(KotlinNativeCompilerOptionsDefault::class.java)
-        .apply {
-            useK2.finalizeValue()
-        }
 
     internal fun syncLanguageSettings(languageSettings: LanguageSettings) {
         applyLanguageSettingsToCompilerOptions(languageSettings, options)
diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeCompilerArgBuilder.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeCompilerArgBuilder.kt
index c4da95b0660..a5842c5690b 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeCompilerArgBuilder.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeCompilerArgBuilder.kt
@@ -187,6 +187,9 @@ internal fun buildKotlinNativeCompileCommonArgs(
     addKey("-nowarn", compilerOptions.suppressWarnings.get())
     addKey("-verbose", compilerOptions.verbose.get())
     addKey("-progressive", compilerOptions.progressiveMode.get())
+    if (compilerOptions.useK2.get()) {
+        add("-Xuse-k2")
+    }
     compilerOptions.optIn.get().forEach { add("-opt-in=$it") }
 
     addAll(compilerOptions.freeCompilerArgs.get())