diff --git a/build.gradle.kts b/build.gradle.kts
index 648877c1044..e8c9ac3e782 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -359,7 +359,7 @@ allprojects {
         maven("https://jetbrains.bintray.com/intellij-third-party-dependencies")
         maven("https://dl.google.com/dl/android/maven2")
         bootstrapKotlinRepo?.let(::maven)
-        internalKotlinRepo?.let(::maven)
+        internalBootstrapRepo?.let(::maven)
     }
 
     configureJvmProject(javaHome!!, jvmTarget!!)
diff --git a/buildSrc/src/main/kotlin/dependencies.kt b/buildSrc/src/main/kotlin/dependencies.kt
index f62aca7bd9f..281c15528a4 100644
--- a/buildSrc/src/main/kotlin/dependencies.kt
+++ b/buildSrc/src/main/kotlin/dependencies.kt
@@ -22,6 +22,15 @@ val Project.intellijRepo get() =
         else -> "https://www.jetbrains.com/intellij-repository/releases"
     }
 
+val Project.internalBootstrapRepo: String? get() =
+    when {
+        bootstrapKotlinRepo?.startsWith("https://buildserver.labs.intellij.net") == true ->
+            bootstrapKotlinRepo!!.replace("artifacts/content/maven", "artifacts/content/internal/repo")
+        else -> "https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_KotlinPublic_Compiler),number:$bootstrapKotlinVersion," +
+                "branch:default:any/artifacts/content/internal/repo/"
+    }
+
+
 fun Project.commonDep(coord: String): String {
     val parts = coord.split(':')
     return when (parts.size) {
diff --git a/dependencies/kotlin-build-gradle-plugin/src/Bootstrap.kt b/dependencies/kotlin-build-gradle-plugin/src/Bootstrap.kt
index 70c166500ba..c2095727db0 100644
--- a/dependencies/kotlin-build-gradle-plugin/src/Bootstrap.kt
+++ b/dependencies/kotlin-build-gradle-plugin/src/Bootstrap.kt
@@ -17,6 +17,7 @@ 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_Compiler),number:$bootstrapKotlinVersion," +
             "branch:default:any/artifacts/content/internal/repo"