diff --git a/build/download_kotlin.xml b/build/download_kotlin.xml
index 40cb54a22538..7b9c418b8dd9 100644
--- a/build/download_kotlin.xml
+++ b/build/download_kotlin.xml
@@ -1,12 +1,21 @@
-<project name="Download Kotlin" default="extract">
-  <property name="kotlin.build.type.id" value="Kotlin_M14_Idea142branch150versionNoTests"/>
-  <property name="kotlin.build.selector" value="status:SUCCESS"/>
-  <property name="kotlin.teamcity.host" value="https://teamcity.jetbrains.com"/>
+<project name="Download Kotlin" default="extract" xmlns:if="ant:if" xmlns:unless="ant:unless">
+  <property name="kotlin.public.build.type.id" value="Kotlin_M14_Idea142branch150versionNoTests"/>
+  <property name="kotlin.public.build.selector" value="status:SUCCESS"/>
+  <property name="kotlin.public.teamcity.host" value="https://teamcity.jetbrains.com"/>
+
+  <property name="kotlin.build.type.id" value="${kotlin.public.build.type.id}"/>
+  <property name="kotlin.build.selector" value="${kotlin.public.build.selector}"/>
+  <property name="kotlin.teamcity.host" value="${kotlin.public.teamcity.host}"/>
 
   <target name="get_latest">
-    <loadresource property="kotlin.build.number">
+    <loadresource property="kotlin.build.number" failonerror="false">
       <url url="${kotlin.teamcity.host}/guestAuth/app/rest/buildTypes/id:${kotlin.build.type.id}/builds/${kotlin.build.selector},count:1/number"/>
     </loadresource>
+
+    <loadresource property="kotlin.build.number" unless:set="kotlin.build.number">
+      <url url="${kotlin.public.teamcity.host}/guestAuth/app/rest/buildTypes/id:${kotlin.public.build.type.id}/builds/${kotlin.public.build.selector},count:1/number"/>
+    </loadresource>
+
   </target>
 
   <target name="check_present" depends="get_latest">
@@ -22,7 +31,10 @@
     <echo message="Downloading Kotlin build ${kotlin.build.number}"/>
     <property name="kotlin.path" value="${basedir}/kotlin-plugin-${kotlin.build.number}.zip"/>
     <get src="${kotlin.teamcity.host}/guestAuth/repository/download/${kotlin.build.type.id}/${kotlin.build.number}/kotlin-plugin-${kotlin.build.number}.zip"
-         dest="${kotlin.path}"/>
+         dest="${kotlin.path}" ignoreerrors="true"/>
+    <available file="${kotlin.path}" property="kotlin.download.success"/>
+    <get src="${kotlin.public.teamcity.host}/guestAuth/repository/download/${kotlin.public.build.type.id}/${kotlin.build.number}/kotlin-plugin-${kotlin.build.number}.zip"
+         dest="${kotlin.path}" unless:set="kotlin.download.success"/>
   </target>
 
   <target name="extract" depends="download">