diff --git a/libraries/tools/kotlin-lombok/build.gradle.kts b/libraries/tools/kotlin-lombok/build.gradle.kts
index baf90e7ccf6..7924e676459 100644
--- a/libraries/tools/kotlin-lombok/build.gradle.kts
+++ b/libraries/tools/kotlin-lombok/build.gradle.kts
@@ -8,8 +8,6 @@ plugins {
 dependencies {
     commonApi(platform(project(":kotlin-gradle-plugins-bom")))
     commonApi(project(":kotlin-gradle-plugin-model"))
-
-    embedded(project(":kotlin-lombok-compiler-plugin")) { isTransitive = false }
 }
 
 projectTest(parallel = true)
diff --git a/libraries/tools/kotlin-lombok/src/common/kotlin/org/jetbrains/kotlin/lombok/gradle/LombokSubplugin.kt b/libraries/tools/kotlin-lombok/src/common/kotlin/org/jetbrains/kotlin/lombok/gradle/LombokSubplugin.kt
index 0be6c9cf233..30978583f4e 100644
--- a/libraries/tools/kotlin-lombok/src/common/kotlin/org/jetbrains/kotlin/lombok/gradle/LombokSubplugin.kt
+++ b/libraries/tools/kotlin-lombok/src/common/kotlin/org/jetbrains/kotlin/lombok/gradle/LombokSubplugin.kt
@@ -38,5 +38,5 @@ class LombokSubplugin @Inject internal constructor(private val registry: Tooling
 
     override fun getCompilerPluginId(): String = "org.jetbrains.kotlin.lombok"
 
-    override fun getPluginArtifact(): SubpluginArtifact = JetBrainsSubpluginArtifact(artifactId = "kotlin-lombok")
+    override fun getPluginArtifact(): SubpluginArtifact = JetBrainsSubpluginArtifact(artifactId = "kotlin-lombok-compiler-plugin-embeddable")
 }
diff --git a/libraries/tools/kotlin-maven-lombok/pom.xml b/libraries/tools/kotlin-maven-lombok/pom.xml
index ff1627e0182..e36721a07e8 100755
--- a/libraries/tools/kotlin-maven-lombok/pom.xml
+++ b/libraries/tools/kotlin-maven-lombok/pom.xml
@@ -5,11 +5,6 @@
 
     <modelVersion>4.0.0</modelVersion>
     <properties>
-        <lombok.common.src>${basedir}/../../../plugins/lombok/lombok.common/src</lombok.common.src>
-        <lombok.k1.src>${basedir}/../../../plugins/lombok/lombok.k1/src</lombok.k1.src>
-        <lombok.k2.src>${basedir}/../../../plugins/lombok/lombok.k2/src</lombok.k2.src>
-        <lombok.cli.src>${basedir}/../../../plugins/lombok/lombok.cli/src</lombok.cli.src>
-        <lombok.resources>${basedir}/../../../plugins/lombok/lombok.cli/resources</lombok.resources>
         <lombok.maven.plugin.src>${basedir}/src/main/kotlin</lombok.maven.plugin.src>
     </properties>
 
@@ -37,6 +32,11 @@
             <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-lombok-compiler-plugin</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-core</artifactId>
@@ -46,12 +46,6 @@
     </dependencies>
 
     <build>
-        <resources>
-            <resource>
-                <directory>${lombok.resources}</directory>
-            </resource>
-        </resources>
-
         <plugins>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
@@ -64,10 +58,6 @@
                         </goals>
                         <configuration>
                             <sources>
-                                <source>${lombok.common.src}</source>
-                                <source>${lombok.k1.src}</source>
-                                <source>${lombok.k2.src}</source>
-                                <source>${lombok.cli.src}</source>
                                 <source>${lombok.maven.plugin.src}</source>
                             </sources>
                         </configuration>
@@ -88,12 +78,6 @@
                         </goals>
                     </execution>
                 </executions>
-                <configuration>
-                    <args>
-                        <arg>-opt-in=org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi</arg>
-                        <arg>-Xcontext-receivers</arg>
-                    </args>
-                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.plexus</groupId>
diff --git a/plugins/lombok/build.gradle.kts b/plugins/lombok/build.gradle.kts
index f0347e6df40..61edbca3515 100644
--- a/plugins/lombok/build.gradle.kts
+++ b/plugins/lombok/build.gradle.kts
@@ -67,6 +67,8 @@ projectTest(jUnitMode = JUnitMode.JUnit5) {
     }
 }
 
+publish()
+
 runtimeJar()
 sourcesJar()
 javadocJar()
diff --git a/plugins/lombok/lombok.embeddable/build.gradle.kts b/plugins/lombok/lombok.embeddable/build.gradle.kts
new file mode 100644
index 00000000000..3312dba604d
--- /dev/null
+++ b/plugins/lombok/lombok.embeddable/build.gradle.kts
@@ -0,0 +1,18 @@
+plugins {
+    id("org.jetbrains.kotlin.jvm")
+}
+
+dependencies {
+    embedded(project(":kotlin-lombok-compiler-plugin")) { isTransitive = false }
+}
+
+publish {
+    artifactId = artifactId.replace(".", "-")
+}
+runtimeJar(rewriteDefaultJarDepsToShadedCompiler())
+sourcesJarWithSourcesFromEmbedded(
+    project(":kotlin-lombok-compiler-plugin").tasks.named<Jar>("sourcesJar")
+)
+javadocJarWithJavadocFromEmbedded(
+    project(":kotlin-lombok-compiler-plugin").tasks.named<Jar>("javadocJar")
+)
diff --git a/settings.gradle b/settings.gradle
index e5005922c1b..d0b10180d81 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -313,6 +313,7 @@ include ":plugins:parcelize:parcelize-compiler",
         ":kotlin-parcelize-compiler"
 
 include ":kotlin-lombok-compiler-plugin",
+        ":kotlin-lombok-compiler-plugin.embeddable",
         ":kotlin-lombok-compiler-plugin.common",
         ":kotlin-lombok-compiler-plugin.k1",
         ":kotlin-lombok-compiler-plugin.k2",
@@ -673,6 +674,7 @@ project(':kotlin-allopen-compiler-plugin.k2').projectDir = "$rootDir/plugins/all
 project(':kotlin-allopen-compiler-plugin.cli').projectDir = "$rootDir/plugins/allopen/allopen.cli" as File
 
 project(':kotlin-lombok-compiler-plugin').projectDir = "$rootDir/plugins/lombok" as File
+project(':kotlin-lombok-compiler-plugin.embeddable').projectDir = "$rootDir/plugins/lombok/lombok.embeddable" as File
 project(':kotlin-lombok-compiler-plugin.cli').projectDir = "$rootDir/plugins/lombok/lombok.cli" as File
 project(':kotlin-lombok-compiler-plugin.k1').projectDir = "$rootDir/plugins/lombok/lombok.k1" as File
 project(':kotlin-lombok-compiler-plugin.k2').projectDir = "$rootDir/plugins/lombok/lombok.k2" as File