diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 918418ae9017..ab23afe705e3 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -16,11 +16,6 @@
       <option name="name" value="3e981f81-9991-429f-bed8-5e9b000571d9" />
       <option name="url" value="https://cache-redirector.jetbrains.com/dl.google.com/dl/android/maven2" />
     </remote-repository>
-    <remote-repository>
-      <option name="id" value="36870030-7a21-4052-b93a-010aa4c33366" />
-      <option name="name" value="36870030-7a21-4052-b93a-010aa4c33366" />
-      <option name="url" value="https://cache-redirector.jetbrains.com/download.jetbrains.com/teamcity-repository" />
-    </remote-repository>
     <remote-repository>
       <option name="id" value="kotlin-ide-plugin-deps" />
       <option name="name" value="kotlin-ide-plugin-deps" />
diff --git a/lib/MODULE.bazel b/lib/MODULE.bazel
index 243cfac622d8..a7fd6629e168 100644
--- a/lib/MODULE.bazel
+++ b/lib/MODULE.bazel
@@ -15618,14 +15618,14 @@ http_file(
 
 http_file(
   name = "org_jetbrains_teamcity-serviceMessages-2024_07_http",
-  url = "https://cache-redirector.jetbrains.com/download.jetbrains.com/teamcity-repository/org/jetbrains/teamcity/serviceMessages/2024.07/serviceMessages-2024.07.jar",
+  url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/ij/intellij-dependencies/org/jetbrains/teamcity/serviceMessages/2024.07/serviceMessages-2024.07.jar",
   sha256 = "5280d3e4bae23c4f1cc59bab77dab9f7a9626aeceeaa0bb07a9868bcedae2da9",
   downloaded_file_path = "serviceMessages-2024.07.jar"
 )
 
 http_file(
   name = "org_jetbrains_teamcity-serviceMessages-2024_07-sources_http",
-  url = "https://cache-redirector.jetbrains.com/download.jetbrains.com/teamcity-repository/org/jetbrains/teamcity/serviceMessages/2024.07/serviceMessages-2024.07-sources.jar",
+  url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/ij/intellij-dependencies/org/jetbrains/teamcity/serviceMessages/2024.07/serviceMessages-2024.07-sources.jar",
   sha256 = "38f4ec9c53269331a3e0c399b0cc8d74f75087cae6c998f15634da0fbf9be591",
   downloaded_file_path = "serviceMessages-2024.07-sources.jar"
 )
diff --git a/platform/build-scripts/bazel/src/org/jetbrains/intellij/build/bazel/UrlCache.kt b/platform/build-scripts/bazel/src/org/jetbrains/intellij/build/bazel/UrlCache.kt
index dc8b76b3fa70..90162d7add9f 100644
--- a/platform/build-scripts/bazel/src/org/jetbrains/intellij/build/bazel/UrlCache.kt
+++ b/platform/build-scripts/bazel/src/org/jetbrains/intellij/build/bazel/UrlCache.kt
@@ -147,11 +147,11 @@ internal fun readModules(modulesBazel: List<Path>, repositories: List<JarReposit
 
       val matchedRepositories = repositories.filter { url.startsWith(it.urlWithSlash) }
       if (matchedRepositories.isEmpty()) {
-        warn("Cannot find repository for $url across all repositories: ${repositories.map { it.urlWithSlash }}")
+        warn("Cannot find repository for $url across all repositories: ${repositories.map { it.urlWithSlash }} in file: $modulesFile")
         continue
       }
       if (matchedRepositories.size > 1) {
-        warn("Multiple repositories match $url: ${matchedRepositories.map { it.urlWithSlash }}")
+        warn("Multiple repositories match $url: ${matchedRepositories.map { it.urlWithSlash }} in file: $modulesFile")
         continue
       }
       val repository = matchedRepositories.single()