diff --git a/build.gradle.kts b/build.gradle.kts
index a33854e4504..599aa75c71c 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -421,9 +421,24 @@ allprojects {
         kotlinBuildLocalRepo(project)
         mirrorRepo?.let(::maven)
 
-        internalBootstrapRepo?.let(::maven)
-        bootstrapKotlinRepo?.let(::maven)
-        maven(protobufRepo)
+        internalBootstrapRepo?.let(::maven)?.apply {
+            content {
+                includeGroup("org.jetbrains.kotlin")
+            }
+        }
+
+        bootstrapKotlinRepo?.let(::maven)?.apply {
+            content {
+                includeGroup("org.jetbrains.kotlin")
+            }
+        }
+
+        maven(protobufRepo) {
+            content {
+                includeModule("org.jetbrains.kotlin", "protobuf-lite")
+                includeModule("org.jetbrains.kotlin", "protobuf-relocated")
+            }
+        }
 
         maven(intellijRepo)
 
diff --git a/buildSrc/src/main/kotlin/dependencies.kt b/buildSrc/src/main/kotlin/dependencies.kt
index a0d81c4f47b..4b576e4a635 100644
--- a/buildSrc/src/main/kotlin/dependencies.kt
+++ b/buildSrc/src/main/kotlin/dependencies.kt
@@ -34,12 +34,16 @@ val Project.intellijRepo get() =
 
 val Project.internalBootstrapRepo: String? get() =
     when {
-        bootstrapKotlinRepo?.startsWith("https://buildserver.labs.intellij.net") == true ->
+        bootstrapKotlinRepo?.startsWith("https://buildserver.labs.intellij.net") == true
+                || bootstrapKotlinRepo?.startsWith("https://teamcity.jetbrains.com") == true ->
             bootstrapKotlinRepo!!.replace("artifacts/content/maven", "artifacts/content/internal/repo")
-        else -> "https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_KotlinPublic_Aggregate),number:$bootstrapKotlinVersion," +
-                "branch:default:any/artifacts/content/internal/repo/"
-    }
 
+        project.kotlinBuildProperties.isJpsBuildEnabled ->
+            "https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_KotlinPublic_Aggregate)," +
+                    "number:$bootstrapKotlinVersion,branch:default:any/artifacts/content/internal/repo/"
+
+        else -> null
+    }
 
 fun Project.commonDep(coord: String): String {
     val parts = coord.split(':')
diff --git a/dependencies/kotlin-build-gradle-plugin/src/Bootstrap.kt b/dependencies/kotlin-build-gradle-plugin/src/Bootstrap.kt
index d33cd5eaf54..c2ad1006f35 100644
--- a/dependencies/kotlin-build-gradle-plugin/src/Bootstrap.kt
+++ b/dependencies/kotlin-build-gradle-plugin/src/Bootstrap.kt
@@ -17,11 +17,6 @@ var Project.bootstrapKotlinRepo: String?
         extensions.extraProperties.set("bootstrapKotlinRepo", value)
     }
 
-@Deprecated("Obsolete, use internalBootstrapRepo instead.")
-val Project.internalKotlinRepo: String?
-    get() = "https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_KotlinPublic_Aggregate),number:$bootstrapKotlinVersion," +
-            "branch:default:any/artifacts/content/internal/repo"
-
 fun Project.kotlinBootstrapFrom(defaultSource: BootstrapOption) {
     val teamCityBootstrapVersion = kotlinBuildProperties.teamCityBootstrapVersion
     val customBootstrapVersion = kotlinBuildProperties.customBootstrapVersion