diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt b/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
index 85884e17e1f..bdaf308e6ca 100644
--- a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
+++ b/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
@@ -192,6 +192,11 @@ open class KotlinCompile() : AbstractKotlinCompile<K2JVMCompilerArguments>() {
         args.languageVersion = kotlinOptions.languageVersion
         args.jvmTarget = kotlinOptions.jvmTarget
         args.allowKotlinPackage = kotlinOptions.allowKotlinPackage
+        args.scriptTemplates = kotlinOptions.scriptTemplates
+
+        if (args.scriptTemplates?.isNotBlank() ?: false) {
+            logger.kotlinDebug { "scriptTemplates = ${args.scriptTemplates}" }
+        }
 
         fun addFriendPathForTestTask(friendKotlinTaskName: String) {
             val friendTask = project.getTasksByName(friendKotlinTaskName, /* recursive = */false).firstOrNull() as? KotlinCompile ?: return
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/KotlinSourceSetProviderImpl.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/KotlinSourceSetProviderImpl.kt
index 3dba01c61cf..f2b776aa214 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/KotlinSourceSetProviderImpl.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/KotlinSourceSetProviderImpl.kt
@@ -19,7 +19,7 @@ private class KotlinSourceSetImpl(displayName: String, resolver: FileResolver) :
             createDefaultSourceDirectorySet(displayName + " Kotlin source", resolver)
 
     init {
-        kotlin.filter?.include("**/*.java", "**/*.kt")
+        kotlin.filter?.include("**/*.java", "**/*.kt", "**/*.kts")
     }
 
     override fun kotlin(configureClosure: Closure<Any?>?): KotlinSourceSet {