diff --git a/libraries/tools/kotlin-maven-noarg/pom.xml b/libraries/tools/kotlin-maven-noarg/pom.xml
index 85c43011665..a1fd4f7fa07 100755
--- a/libraries/tools/kotlin-maven-noarg/pom.xml
+++ b/libraries/tools/kotlin-maven-noarg/pom.xml
@@ -5,12 +5,6 @@
 
     <modelVersion>4.0.0</modelVersion>
     <properties>
-        <noarg.common.src>${basedir}/../../../plugins/noarg/noarg.common/src</noarg.common.src>
-        <noarg.k1.src>${basedir}/../../../plugins/noarg/noarg.k1/src</noarg.k1.src>
-        <noarg.k2.src>${basedir}/../../../plugins/noarg/noarg.k2/src</noarg.k2.src>
-        <noarg.backend.src>${basedir}/../../../plugins/noarg/noarg.backend/src</noarg.backend.src>
-        <noarg.cli.src>${basedir}/../../../plugins/noarg/noarg.cli/src</noarg.cli.src>
-        <noarg.resources>${basedir}/../../../plugins/noarg/noarg.cli/resources</noarg.resources>
         <noarg.maven.plugin.src>${basedir}/src/main/kotlin</noarg.maven.plugin.src>
     </properties>
 
@@ -38,6 +32,11 @@
             <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-noarg-compiler-plugin</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-core</artifactId>
@@ -47,10 +46,6 @@
     </dependencies>
 
     <build>
-        <resources>
-            <resource><directory>${noarg.resources}</directory></resource>
-        </resources>
-
         <plugins>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
@@ -62,11 +57,6 @@
                         <configuration>
                             <sources>
                                 <source>${noarg.maven.plugin.src}</source>
-                                <source>${noarg.common.src}</source>
-                                <source>${noarg.k1.src}</source>
-                                <source>${noarg.k2.src}</source>
-                                <source>${noarg.backend.src}</source>
-                                <source>${noarg.cli.src}</source>
                             </sources>
                         </configuration>
                     </execution>
@@ -88,9 +78,6 @@
 
                 <configuration>
                     <jvmTarget>1.8</jvmTarget>
-                    <args>
-                        <arg>-opt-in=org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi</arg>
-                    </args>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/libraries/tools/kotlin-noarg/build.gradle.kts b/libraries/tools/kotlin-noarg/build.gradle.kts
index facb2dd8882..59b9c34942f 100644
--- a/libraries/tools/kotlin-noarg/build.gradle.kts
+++ b/libraries/tools/kotlin-noarg/build.gradle.kts
@@ -18,8 +18,6 @@ dependencies {
 
     testImplementation(gradleApi())
     testImplementation(commonDependency("junit"))
-
-    embedded(project(":kotlin-noarg-compiler-plugin")) { isTransitive = false }
 }
 
 gradlePlugin {
diff --git a/libraries/tools/kotlin-noarg/src/common/kotlin/org/jetbrains/kotlin/noarg/gradle/NoArgSubplugin.kt b/libraries/tools/kotlin-noarg/src/common/kotlin/org/jetbrains/kotlin/noarg/gradle/NoArgSubplugin.kt
index b8b20f4b789..15cf9000bc0 100644
--- a/libraries/tools/kotlin-noarg/src/common/kotlin/org/jetbrains/kotlin/noarg/gradle/NoArgSubplugin.kt
+++ b/libraries/tools/kotlin-noarg/src/common/kotlin/org/jetbrains/kotlin/noarg/gradle/NoArgSubplugin.kt
@@ -33,7 +33,7 @@ class NoArgGradleSubplugin
             return project.extensions.getByType(NoArgExtension::class.java)
         }
 
-        private const val NOARG_ARTIFACT_NAME = "kotlin-noarg"
+        private const val NOARG_ARTIFACT_NAME = "kotlin-noarg-compiler-plugin-embeddable"
 
         private const val ANNOTATION_ARG_NAME = "annotation"
         private const val PRESET_ARG_NAME = "preset"
diff --git a/plugins/noarg/build.gradle.kts b/plugins/noarg/build.gradle.kts
index 92fbc5de9a2..58956e5b9dc 100644
--- a/plugins/noarg/build.gradle.kts
+++ b/plugins/noarg/build.gradle.kts
@@ -39,6 +39,8 @@ sourceSets {
 
 optInToExperimentalCompilerApi()
 
+publish()
+
 runtimeJar()
 sourcesJar()
 javadocJar()
diff --git a/plugins/noarg/noarg.embeddable/build.gradle.kts b/plugins/noarg/noarg.embeddable/build.gradle.kts
new file mode 100644
index 00000000000..9538b81be6e
--- /dev/null
+++ b/plugins/noarg/noarg.embeddable/build.gradle.kts
@@ -0,0 +1,19 @@
+plugins {
+    id("org.jetbrains.kotlin.jvm")
+}
+
+dependencies {
+    embedded(project(":kotlin-noarg-compiler-plugin")) { isTransitive = false }
+}
+
+publish {
+    artifactId = artifactId.replace(".", "-")
+}
+
+runtimeJar(rewriteDefaultJarDepsToShadedCompiler())
+sourcesJarWithSourcesFromEmbedded(
+    project(":kotlin-noarg-compiler-plugin").tasks.named<Jar>("sourcesJar")
+)
+javadocJarWithJavadocFromEmbedded(
+    project(":kotlin-noarg-compiler-plugin").tasks.named<Jar>("javadocJar")
+)
diff --git a/settings.gradle b/settings.gradle
index d0b10180d81..d9a68bc104a 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -133,6 +133,7 @@ include ":kotlin-allopen-compiler-plugin",
         ":kotlin-allopen-compiler-plugin.cli"
 
 include ":kotlin-noarg-compiler-plugin",
+        ":kotlin-noarg-compiler-plugin.embeddable",
         ":kotlin-noarg-compiler-plugin.common",
         ":kotlin-noarg-compiler-plugin.k1",
         ":kotlin-noarg-compiler-plugin.k2",
@@ -681,6 +682,7 @@ project(':kotlin-lombok-compiler-plugin.k2').projectDir = "$rootDir/plugins/lomb
 project(':kotlin-lombok-compiler-plugin.common').projectDir = "$rootDir/plugins/lombok/lombok.common" as File
 
 project(':kotlin-noarg-compiler-plugin').projectDir = "$rootDir/plugins/noarg" as File
+project(':kotlin-noarg-compiler-plugin.embeddable').projectDir = "$rootDir/plugins/noarg/noarg.embeddable" as File
 project(':kotlin-noarg-compiler-plugin.common').projectDir = "$rootDir/plugins/noarg/noarg.common" as File
 project(':kotlin-noarg-compiler-plugin.k1').projectDir = "$rootDir/plugins/noarg/noarg.k1" as File
 project(':kotlin-noarg-compiler-plugin.k2').projectDir = "$rootDir/plugins/noarg/noarg.k2" as File