diff --git a/pluginPublisher/TeamCityPluginPublisher.xml b/pluginPublisher/TeamCityPluginPublisher.xml
index 01b7050009d..1523395770b 100644
--- a/pluginPublisher/TeamCityPluginPublisher.xml
+++ b/pluginPublisher/TeamCityPluginPublisher.xml
@@ -65,7 +65,7 @@
       <filterchain>
         <tokenfilter>
           <filetokenizer/>
-          <replaceregex pattern="^(.*)(http://download\.jetbrains\.com/idea/ideaIC\-\d+\.\d+\.tar\.gz)(.*)$" replace="\2" flags="s"/>
+          <replaceregex pattern="^(.*)(http://download\.jetbrains\.com/idea/ideaIC\-[\d\.]+tar\.gz)(.*)$" replace="\2" flags="s"/>
         </tokenfilter>
       </filterchain>
     </loadresource>
diff --git a/update_dependencies.xml b/update_dependencies.xml
index c130b17c5ac..5c7a3a8de89 100644
--- a/update_dependencies.xml
+++ b/update_dependencies.xml
@@ -394,7 +394,9 @@
             <filterchain>
               <tokenfilter>
                 <filetokenizer/>
-                <replaceregex pattern="^(.*)http://dl\.google\.com/dl/android/studio/ide-zips/(\d+\.\d+\.\d+)(.*)$" replace="\2" flags="s"/>
+                <replaceregex
+                    pattern="^(.*)http://dl\.google\.com/dl/android/studio/ide-zips/([\d\.]+)/android-studio-ide(.*)$"
+                    replace="\2" flags="s"/>
               </tokenfilter>
             </filterchain>
           </loadresource>
@@ -403,7 +405,9 @@
             <filterchain>
               <tokenfilter>
                 <filetokenizer/>
-                <replaceregex pattern="^(.*)http://dl\.google\.com/dl/android/studio/ide-zips/\d+\.\d+\.\d+/android-studio-ide-(\d+\.\d+)(.*)$" replace="\2" flags="s"/>
+                <replaceregex
+                    pattern="^(.*)http://dl\.google\.com/dl/android/studio/ide-zips/[\d\.]+/android-studio-ide-([\d\.]+)-(.*)$"
+                    replace="\2" flags="s"/>
               </tokenfilter>
             </filterchain>
           </loadresource>