diff --git a/build.gradle.kts b/build.gradle.kts
index e3037541ca7..2ef92eaa1cf 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -242,14 +242,8 @@ extra["compilerModules"] =
             commonCompilerModules +
             firAllCompilerModules
 
-
-extra["compilerModulesForJps"] = listOf(
-    ":kotlin-daemon-client",
-    ":kotlin-reflect",
-    ":kotlin-build-common",
-    ":kotlin-util-io",
-    ":kotlin-util-klib",
-    ":kotlin-util-klib-metadata",
+// They are embedded just because we don't publish those dependencies as separate Maven artifacts (yet)
+extra["kotlinJpsPluginEmbeddedDependencies"] = listOf(
     ":compiler:cli-common",
     ":kotlin-compiler-runner-unshaded",
     ":daemon-common",
@@ -259,7 +253,6 @@ extra["compilerModulesForJps"] = listOf(
     ":core:descriptors",
     ":core:descriptors.jvm",
     ":compiler:backend.common.jvm",
-    ":native:kotlin-native-utils",
     ":js:js.serializer",
     ":core:deserialization",
     ":core:deserialization.common",
@@ -277,6 +270,16 @@ extra["compilerModulesForJps"] = listOf(
     ":compiler:compiler.version"
 )
 
+extra["kotlinJpsPluginMavenDependencies"] = listOf(
+    ":kotlin-daemon-client",
+    ":kotlin-build-common",
+    ":kotlin-reflect",
+    ":kotlin-util-io",
+    ":kotlin-util-klib",
+    ":kotlin-util-klib-metadata",
+    ":native:kotlin-native-utils"
+)
+
 extra["compilerArtifactsForIde"] = listOfNotNull(
     ":prepare:ide-plugin-dependencies:android-extensions-compiler-plugin-for-ide",
     ":prepare:ide-plugin-dependencies:allopen-compiler-plugin-for-ide",
diff --git a/jps/jps-common/build.gradle.kts b/jps/jps-common/build.gradle.kts
index ad19a564529..8986166a6c8 100644
--- a/jps/jps-common/build.gradle.kts
+++ b/jps/jps-common/build.gradle.kts
@@ -6,7 +6,11 @@ plugins {
 
 dependencies {
     implementation(kotlinStdlib())
-    rootProject.extra["compilerModulesForJps"]
+    rootProject.extra["kotlinJpsPluginEmbeddedDependencies"]
+        .let { it as List<String> }
+        .forEach { implementation(project(it)) }
+
+    rootProject.extra["kotlinJpsPluginMavenDependencies"]
         .let { it as List<String> }
         .forEach { implementation(project(it)) }
 
diff --git a/jps/jps-plugin/build.gradle.kts b/jps/jps-plugin/build.gradle.kts
index f35128fe3d7..1762e35c074 100644
--- a/jps/jps-plugin/build.gradle.kts
+++ b/jps/jps-plugin/build.gradle.kts
@@ -18,7 +18,11 @@ dependencies {
     compileOnly(project(":jps:jps-platform-api-signatures"))
     testImplementation(projectTests(":generators:test-generator"))
 
-    rootProject.extra["compilerModulesForJps"]
+    rootProject.extra["kotlinJpsPluginEmbeddedDependencies"]
+        .let { it as List<String> }
+        .forEach { implementation(project(it)) }
+
+    rootProject.extra["kotlinJpsPluginMavenDependencies"]
         .let { it as List<String> }
         .forEach { implementation(project(it)) }
 
diff --git a/prepare/ide-plugin-dependencies/kotlin-jps-plugin-classpath/build.gradle.kts b/prepare/ide-plugin-dependencies/kotlin-jps-plugin-classpath/build.gradle.kts
index 3532f47e1bd..621b90689dd 100644
--- a/prepare/ide-plugin-dependencies/kotlin-jps-plugin-classpath/build.gradle.kts
+++ b/prepare/ide-plugin-dependencies/kotlin-jps-plugin-classpath/build.gradle.kts
@@ -1,8 +1,10 @@
 idePluginDependency {
     @Suppress("UNCHECKED_CAST")
-    val compilerComponents = rootProject.extra["compilerModulesForJps"] as List<String>
+    val embeddedDependencies = rootProject.extra["kotlinJpsPluginEmbeddedDependencies"] as List<String>
+    @Suppress("UNCHECKED_CAST")
+    val mavenDependencies = rootProject.extra["kotlinJpsPluginMavenDependencies"] as List<String>
 
     val otherProjects = listOf(":jps:jps-plugin", ":jps:jps-common")
 
-    publishProjectJars(compilerComponents + otherProjects, libraryDependencies = listOf(protobufFull()))
+    publishProjectJars(embeddedDependencies + mavenDependencies + otherProjects, libraryDependencies = listOf(protobufFull()))
 }