diff --git a/build/download_kotlin.xml b/build/download_kotlin.xml
index 28603cca6e6a..40cb54a22538 100644
--- a/build/download_kotlin.xml
+++ b/build/download_kotlin.xml
@@ -1,10 +1,11 @@
 <project name="Download Kotlin" default="extract">
   <property name="kotlin.build.type.id" value="Kotlin_M14_Idea142branch150versionNoTests"/>
-  <property name="kotlin.build.selector" value=".lastSuccessful"/>
+  <property name="kotlin.build.selector" value="status:SUCCESS"/>
+  <property name="kotlin.teamcity.host" value="https://teamcity.jetbrains.com"/>
 
   <target name="get_latest">
     <loadresource property="kotlin.build.number">
-      <url url="https://teamcity.jetbrains.com/guestAuth/app/rest/buildTypes/id:${kotlin.build.type.id}/builds/status:SUCCESS,count:1/number"/>
+      <url url="${kotlin.teamcity.host}/guestAuth/app/rest/buildTypes/id:${kotlin.build.type.id}/builds/${kotlin.build.selector},count:1/number"/>
     </loadresource>
   </target>
 
@@ -20,7 +21,7 @@
     <delete dir="${basedir}" includes="kotlin-plugin*.zip"/>
     <echo message="Downloading Kotlin build ${kotlin.build.number}"/>
     <property name="kotlin.path" value="${basedir}/kotlin-plugin-${kotlin.build.number}.zip"/>
-    <get src="https://teamcity.jetbrains.com/guestAuth/repository/download/${kotlin.build.type.id}/${kotlin.build.number}/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}"/>
   </target>