diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 3c1b0f46dfe..b05852cf41e 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -31,7 +31,6 @@ plugins {
     `kotlin-dsl`
     `java-gradle-plugin`
     id("org.jetbrains.kotlin.jvm")
-    id("org.jetbrains.kotlin.plugin.sam.with.receiver")
 }
 
 gradlePlugin {
diff --git a/repo/codebase-tests/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt b/repo/codebase-tests/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt
index 37c465dcc58..75fcd5dec94 100644
--- a/repo/codebase-tests/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt
+++ b/repo/codebase-tests/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt
@@ -138,6 +138,7 @@ class CodeConformanceTest : TestCase() {
                 "repo/gradle-settings-conventions/build-cache/build/generated-sources",
                 "repo/gradle-settings-conventions/jvm-toolchain-provisioning/build/generated-sources",
                 "repo/gradle-settings-conventions/gradle-enterprise/build/generated-sources",
+                "repo/gradle-settings-conventions/kotlin-daemon-config/build/generated-sources"
             )
         )
     }
diff --git a/repo/gradle-settings-conventions/kotlin-daemon-config/build.gradle.kts b/repo/gradle-settings-conventions/kotlin-daemon-config/build.gradle.kts
index 9159aaa74f4..a8298309d61 100644
--- a/repo/gradle-settings-conventions/kotlin-daemon-config/build.gradle.kts
+++ b/repo/gradle-settings-conventions/kotlin-daemon-config/build.gradle.kts
@@ -10,7 +10,7 @@ repositories {
 
 dependencies {
     // TODO: migrate to api only dependency once Kotlin daemon configuration will be available there (Yahor)
-    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin")
+    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin-api")
 }
 
 kotlin.jvmToolchain(8)
diff --git a/repo/gradle-settings-conventions/kotlin-daemon-config/src/main/kotlin/kotlin-daemon-config.settings.gradle.kts b/repo/gradle-settings-conventions/kotlin-daemon-config/src/main/kotlin/kotlin-daemon-config.settings.gradle.kts
index 7f70b7f7010..707b909bb3b 100644
--- a/repo/gradle-settings-conventions/kotlin-daemon-config/src/main/kotlin/kotlin-daemon-config.settings.gradle.kts
+++ b/repo/gradle-settings-conventions/kotlin-daemon-config/src/main/kotlin/kotlin-daemon-config.settings.gradle.kts
@@ -1,13 +1,15 @@
-import org.jetbrains.kotlin.gradle.dsl.KotlinTopLevelExtension
 import org.jetbrains.kotlin.gradle.plugin.KotlinBasePlugin
+import org.jetbrains.kotlin.gradle.tasks.CompileUsingKotlinDaemon
 
 gradle.afterProject {
     plugins.withType<KotlinBasePlugin> {
-        extensions.configure<KotlinTopLevelExtension> {
+        tasks.withType<CompileUsingKotlinDaemon>().configureEach {
             // Should be in sync with 'gradle-settings-conventions/gradle.properties'
-            kotlinDaemonJvmArgs = listOf(
-                "-Xmx3g",
-                "-Dkotlin.js.compiler.legacy.force_enabled=true"
+            kotlinDaemonJvmArguments.set(
+                listOf(
+                    "-Xmx3g",
+                    "-Dkotlin.js.compiler.legacy.force_enabled=true"
+                )
             )
         }
     }