diff --git a/libraries/tools/kotlin-noarg/build.gradle b/libraries/tools/kotlin-noarg/build.gradle
deleted file mode 100644
index 60adf660b26..00000000000
--- a/libraries/tools/kotlin-noarg/build.gradle
+++ /dev/null
@@ -1,38 +0,0 @@
-plugins {
-    id "gradle-plugin-common-configuration"
-    id "jps-compatible"
-}
-
-pill {
-    variant = 'FULL'
-}
-
-dependencies {
-    api project(':kotlin-gradle-plugin-api')
-    api project(':kotlin-gradle-plugin-model')
-
-    compileOnly project(':compiler')
-    compileOnly project(':kotlin-noarg-compiler-plugin')
-
-    testApi gradleApi()
-    testApi(DependenciesKt.commonDependency(project, "junit"))
-
-    embedded(project(":kotlin-noarg-compiler-plugin")) { transitive = false }
-}
-
-ArtifactsKt.runtimeJar(project, EmbeddableKt.rewriteDefaultJarDepsToShadedCompiler(project, {}), {})
-
-pluginBundle {
-    plugins {
-        kotlinNoargPlugin {
-            id = 'org.jetbrains.kotlin.plugin.noarg'
-            description = displayName = 'Kotlin No Arg compiler plugin'
-        }
-        kotlinJpaPlugin {
-            id = 'org.jetbrains.kotlin.plugin.jpa'
-            description = displayName = 'Kotlin JPA compiler plugin'
-        }
-    }
-}
-
-configurePluginMarkers(project)
diff --git a/libraries/tools/kotlin-noarg/build.gradle.kts b/libraries/tools/kotlin-noarg/build.gradle.kts
new file mode 100644
index 00000000000..6516bcae5ae
--- /dev/null
+++ b/libraries/tools/kotlin-noarg/build.gradle.kts
@@ -0,0 +1,39 @@
+import org.jetbrains.kotlin.pill.PillExtension
+
+plugins {
+    id("gradle-plugin-common-configuration")
+    id("jps-compatible")
+}
+
+pill {
+    variant = PillExtension.Variant.FULL
+}
+
+dependencies {
+    api(project(":kotlin-gradle-plugin-model"))
+
+    compileOnly(project(":compiler"))
+    compileOnly(project(":kotlin-noarg-compiler-plugin"))
+
+    testImplementation(gradleApi())
+    testImplementation(commonDependency("junit"))
+
+    embedded(project(":kotlin-noarg-compiler-plugin")) { isTransitive = false }
+}
+
+gradlePlugin {
+    plugins {
+        create("kotlinNoargPlugin") {
+            id = "org.jetbrains.kotlin.plugin.noarg"
+            displayName = "Kotlin No Arg compiler plugin"
+            description = displayName
+            implementationClass = "org.jetbrains.kotlin.noarg.gradle.NoArgGradleSubplugin"
+        }
+        create("kotlinJpaPlugin") {
+            id = "org.jetbrains.kotlin.plugin.jpa"
+            displayName = "Kotlin JPA compiler plugin"
+            description = displayName
+            implementationClass = "org.jetbrains.kotlin.noarg.gradle.KotlinJpaSubplugin"
+        }
+    }
+}
diff --git a/libraries/tools/kotlin-noarg/src/main/resources/META-INF/gradle-plugins/org.jetbrains.kotlin.plugin.jpa.properties b/libraries/tools/kotlin-noarg/src/main/resources/META-INF/gradle-plugins/org.jetbrains.kotlin.plugin.jpa.properties
deleted file mode 100644
index 197f43c9cf8..00000000000
--- a/libraries/tools/kotlin-noarg/src/main/resources/META-INF/gradle-plugins/org.jetbrains.kotlin.plugin.jpa.properties
+++ /dev/null
@@ -1 +0,0 @@
-implementation-class=org.jetbrains.kotlin.noarg.gradle.KotlinJpaSubplugin
\ No newline at end of file
diff --git a/libraries/tools/kotlin-noarg/src/main/resources/META-INF/gradle-plugins/org.jetbrains.kotlin.plugin.noarg.properties b/libraries/tools/kotlin-noarg/src/main/resources/META-INF/gradle-plugins/org.jetbrains.kotlin.plugin.noarg.properties
deleted file mode 100644
index 4da171e05df..00000000000
--- a/libraries/tools/kotlin-noarg/src/main/resources/META-INF/gradle-plugins/org.jetbrains.kotlin.plugin.noarg.properties
+++ /dev/null
@@ -1 +0,0 @@
-implementation-class=org.jetbrains.kotlin.noarg.gradle.NoArgGradleSubplugin
\ No newline at end of file