diff --git a/build.gradle b/build.gradle
index 1ab54b85..f721c182 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,8 +18,9 @@ allprojects {
 repositories {
   ivy {
       url 'https://teamcity.jetbrains.com/guestAuth/repository/download'
-      layout ('pattern') {
-          artifact '[organization]/[revision]/[revision].[ext]'
+      patternLayout {
+        ivy '[module]/[revision]/teamcity-ivy.xml'
+        artifact '[module]/[revision]/[revision].[ext]'
       }
   }
 }
@@ -37,7 +38,7 @@ dependencies {
   }
 
   // MPS-related stuff declared as project properties
-  mps "${mpsBuildConfiguration}:MPS:${mpsBuildNumber}:${mpsBuildLabel}.tcbuildtag@zip"
+  mps "org:${mpsBuildConfiguration}:${mpsBuildNumber}:${mpsBuildLabel}.tcbuildtag@zip"
 }
 
 task installMps(type: Copy)  {