diff --git a/update_dependencies.xml b/update_dependencies.xml
index d398a891c7c..eb68b85aaba 100644
--- a/update_dependencies.xml
+++ b/update_dependencies.xml
@@ -21,35 +21,15 @@
     <property name="idea.sdk.fetch.needed" value="true"/>
 
     <target name="update" depends="fetch-third-party,fetch-annotations" description="Update dependencies from public server">
-        <loadresource property="public.buildserver.build.id">
-            <url url="https://teamcity.jetbrains.com/guestAuth/app/rest/builds/?locator=buildType:bt410,status:SUCCESS,lookupLimit:1,branch:idea/${ideaVersion}"/>
-            <filterchain>
-                <tokenfilter>
-                    <filetokenizer/>
-                    <replaceregex pattern="^(.*)\sid=&quot;(\d+)&quot;(.*)$" replace="\2" flags="s"/>
-                </tokenfilter>
-            </filterchain>
-        </loadresource>
-
-        <echo message="IDEA build id: ${public.buildserver.build.id}"/>
-
-        <execute_update base.url="https://teamcity.jetbrains.com/guestAuth/app/rest/builds/id:${public.buildserver.build.id}"/>
+        <execute_update_with_id_resolve
+            teamcity.server.url="https://teamcity.jetbrains.com"
+            build.locator.request="buildType:bt410,status:SUCCESS,lookupLimit:1,branch:idea/${ideaVersion}"/>
     </target>
 
     <target name="jb_update" depends="fetch-third-party,fetch-annotations" description="Update dependencies from internal server">
-        <loadresource property="jb.buildserver.build.id">
-            <url url="http://buildserver.labs.intellij.net/guestAuth/app/rest/builds/?locator=buildType:bt3498,status:SUCCESS,lookupLimit:1,branch:/idea/${ideaVersion}"/>
-            <filterchain>
-                <tokenfilter>
-                    <filetokenizer/>
-                    <replaceregex pattern="^(.*)\sid=&quot;(\d+)&quot;(.*)$" replace="\2" flags="s"/>
-                </tokenfilter>
-            </filterchain>
-        </loadresource>
-
-        <echo message="IDEA build id: ${jb.buildserver.build.id}"/>
-
-        <execute_update base.url="http://buildserver.labs.intellij.net/guestAuth/app/rest/builds/id:${jb.buildserver.build.id}"/>
+        <execute_update_with_id_resolve
+            teamcity.server.url="http://buildserver.labs.intellij.net"
+            build.locator.request="buildType:bt3498,status:SUCCESS,lookupLimit:1,branch:/idea/${ideaVersion}"/>
     </target>
 
     <target name="jb_update_continuous_139" depends="fetch-third-party,fetch-annotations">
@@ -262,6 +242,27 @@
         </sequential>
     </macrodef>
 
+    <macrodef name="execute_update_with_id_resolve">
+        <attribute name="teamcity.server.url"/>
+        <attribute name="build.locator.request"/>
+
+        <sequential>
+            <loadresource property="execute.build.id">
+                <url url="@{teamcity.server.url}/guestAuth/app/rest/builds/?locator=@{build.locator.request}"/>
+                <filterchain>
+                    <tokenfilter>
+                        <filetokenizer/>
+                        <replaceregex pattern="^(.*)\sid=&quot;(\d+)&quot;(.*)$" replace="\2" flags="s"/>
+                    </tokenfilter>
+                </filterchain>
+            </loadresource>
+
+            <echo message="IDEA build id: ${execute.build.id}"/>
+
+            <execute_update base.url="@{teamcity.server.url}/guestAuth/app/rest/builds/id:${execute.build.id}"/>
+        </sequential>
+    </macrodef>
+
     <macrodef name="execute_update">
         <attribute name="base.url"/>