diff --git a/action_basics/build.gradle b/action_basics/build.gradle
index 9092bea0c..f3e2667f7 100644
--- a/action_basics/build.gradle
+++ b/action_basics/build.gradle
@@ -17,7 +17,6 @@ repositories {
 // See https://github.com/JetBrains/gradle-intellij-plugin/
 intellij {
   version = '2020.1'
-  sameSinceUntilBuild = true
 }
 
 buildSearchableOptions {
@@ -26,4 +25,6 @@ buildSearchableOptions {
 
 patchPluginXml {
   version = project.version
+  sinceBuild = '201'
+  untilBuild = '201.*'
 }
diff --git a/comparing_references_inspection/build.gradle b/comparing_references_inspection/build.gradle
index 3058d1fe8..92927c215 100644
--- a/comparing_references_inspection/build.gradle
+++ b/comparing_references_inspection/build.gradle
@@ -28,7 +28,6 @@ dependencies {
 intellij {
   version = '2020.1'
   plugins = ['java']
-  sameSinceUntilBuild = true
 }
 
 buildSearchableOptions {
@@ -37,4 +36,6 @@ buildSearchableOptions {
 
 patchPluginXml {
   version = project.version
+  sinceBuild = '201'
+  untilBuild = '201.*'
 }
diff --git a/conditional_operator_intention/build.gradle b/conditional_operator_intention/build.gradle
index 25dd0ecdb..82051dbe0 100644
--- a/conditional_operator_intention/build.gradle
+++ b/conditional_operator_intention/build.gradle
@@ -28,7 +28,6 @@ test {
 intellij {
   version = '2020.1'
   plugins = ['java']
-  sameSinceUntilBuild = true
 }
 
 buildSearchableOptions {
@@ -37,4 +36,6 @@ buildSearchableOptions {
 
 patchPluginXml {
   version = project.version
+  sinceBuild = '201'
+  untilBuild = '201.*'
 }
diff --git a/editor_basics/build.gradle b/editor_basics/build.gradle
index 9092bea0c..f3e2667f7 100644
--- a/editor_basics/build.gradle
+++ b/editor_basics/build.gradle
@@ -17,7 +17,6 @@ repositories {
 // See https://github.com/JetBrains/gradle-intellij-plugin/
 intellij {
   version = '2020.1'
-  sameSinceUntilBuild = true
 }
 
 buildSearchableOptions {
@@ -26,4 +25,6 @@ buildSearchableOptions {
 
 patchPluginXml {
   version = project.version
+  sinceBuild = '201'
+  untilBuild = '201.*'
 }
diff --git a/facet_basics/build.gradle b/facet_basics/build.gradle
index 012769410..935af540d 100644
--- a/facet_basics/build.gradle
+++ b/facet_basics/build.gradle
@@ -17,7 +17,6 @@ repositories {
 // See https://github.com/JetBrains/gradle-intellij-plugin/
 intellij {
   version = '2020.1'
-  sameSinceUntilBuild = true
 }
 
 buildSearchableOptions {
@@ -26,5 +25,7 @@ buildSearchableOptions {
 
 patchPluginXml {
   version = project.version
+  sinceBuild = '201'
+  untilBuild = '201.*'
 }
 
diff --git a/framework_basics/build.gradle b/framework_basics/build.gradle
index ed24c5152..cee49a95c 100644
--- a/framework_basics/build.gradle
+++ b/framework_basics/build.gradle
@@ -18,7 +18,6 @@ repositories {
 intellij {
   version = '2020.1'
   plugins = ['java']
-  sameSinceUntilBuild = true
 }
 
 buildSearchableOptions {
@@ -27,4 +26,6 @@ buildSearchableOptions {
 
 patchPluginXml {
   version = project.version
+  sinceBuild = '201'
+  untilBuild = '201.*'
 }
diff --git a/inspection_basics/build.gradle b/inspection_basics/build.gradle
index 9092bea0c..f3e2667f7 100644
--- a/inspection_basics/build.gradle
+++ b/inspection_basics/build.gradle
@@ -17,7 +17,6 @@ repositories {
 // See https://github.com/JetBrains/gradle-intellij-plugin/
 intellij {
   version = '2020.1'
-  sameSinceUntilBuild = true
 }
 
 buildSearchableOptions {
@@ -26,4 +25,6 @@ buildSearchableOptions {
 
 patchPluginXml {
   version = project.version
+  sinceBuild = '201'
+  untilBuild = '201.*'
 }
diff --git a/kotlin_demo/build.gradle b/kotlin_demo/build.gradle
index 2d581c498..98bf2e613 100644
--- a/kotlin_demo/build.gradle
+++ b/kotlin_demo/build.gradle
@@ -26,13 +26,18 @@ sourceSets {
 // See https://github.com/JetBrains/gradle-intellij-plugin/
 intellij {
   version = '2020.1'
-  sameSinceUntilBuild = true
 }
 
 buildSearchableOptions {
   enabled = false
 }
 
+patchPluginXml {
+  version = project.version
+  sinceBuild = '201'
+  untilBuild = '201.*'
+}
+
 compileKotlin {
   kotlinOptions.jvmTarget = "1.8"
 }
diff --git a/live_templates/build.gradle b/live_templates/build.gradle
index b4e0b46fb..69a7e4afa 100644
--- a/live_templates/build.gradle
+++ b/live_templates/build.gradle
@@ -17,7 +17,6 @@ repositories {
 // See https://github.com/JetBrains/gradle-intellij-plugin/
 intellij {
   version = '2020.1'
-  sameSinceUntilBuild = true
 }
 
 buildSearchableOptions {
@@ -26,4 +25,6 @@ buildSearchableOptions {
 
 patchPluginXml {
   version = project.version
+  sinceBuild = '201'
+  untilBuild = '201.*'
 }
\ No newline at end of file
diff --git a/max_opened_projects/build.gradle b/max_opened_projects/build.gradle
index 8f7044d98..79566ccdb 100644
--- a/max_opened_projects/build.gradle
+++ b/max_opened_projects/build.gradle
@@ -17,7 +17,6 @@ repositories {
 // See https://github.com/JetBrains/gradle-intellij-plugin/
 intellij {
   version = '2020.1'
-  sameSinceUntilBuild = true
 }
 
 buildSearchableOptions {
@@ -26,4 +25,6 @@ buildSearchableOptions {
 
 patchPluginXml {
   version = project.version
+  sinceBuild = '201'
+  untilBuild = '201.*'
 }
diff --git a/module/build.gradle b/module/build.gradle
index 9092bea0c..f3e2667f7 100644
--- a/module/build.gradle
+++ b/module/build.gradle
@@ -17,7 +17,6 @@ repositories {
 // See https://github.com/JetBrains/gradle-intellij-plugin/
 intellij {
   version = '2020.1'
-  sameSinceUntilBuild = true
 }
 
 buildSearchableOptions {
@@ -26,4 +25,6 @@ buildSearchableOptions {
 
 patchPluginXml {
   version = project.version
+  sinceBuild = '201'
+  untilBuild = '201.*'
 }
diff --git a/product_specific/pycharm_basics/build.gradle b/product_specific/pycharm_basics/build.gradle
index b3aa2e950..34ba9c5f7 100644
--- a/product_specific/pycharm_basics/build.gradle
+++ b/product_specific/pycharm_basics/build.gradle
@@ -18,7 +18,6 @@ repositories {
 intellij {
   version = '2020.1'
   type = 'PY'
-  sameSinceUntilBuild = true
 }
 
 buildSearchableOptions {
@@ -27,4 +26,6 @@ buildSearchableOptions {
 
 patchPluginXml {
   version = project.version
+  sinceBuild = '201'
+  untilBuild = '201.*'
 }
diff --git a/project_model/build.gradle b/project_model/build.gradle
index ed24c5152..cee49a95c 100644
--- a/project_model/build.gradle
+++ b/project_model/build.gradle
@@ -18,7 +18,6 @@ repositories {
 intellij {
   version = '2020.1'
   plugins = ['java']
-  sameSinceUntilBuild = true
 }
 
 buildSearchableOptions {
@@ -27,4 +26,6 @@ buildSearchableOptions {
 
 patchPluginXml {
   version = project.version
+  sinceBuild = '201'
+  untilBuild = '201.*'
 }
diff --git a/project_view_pane/build.gradle b/project_view_pane/build.gradle
index ea590c363..4405d7387 100644
--- a/project_view_pane/build.gradle
+++ b/project_view_pane/build.gradle
@@ -17,7 +17,6 @@ repositories {
 // See https://github.com/JetBrains/gradle-intellij-plugin/
 intellij {
   version = '2020.1'
-  sameSinceUntilBuild = true
 }
 
 buildSearchableOptions {
@@ -26,4 +25,6 @@ buildSearchableOptions {
 
 patchPluginXml {
   version = project.version
+  sinceBuild = '201'
+  untilBuild = '201.*'
 }
\ No newline at end of file
diff --git a/project_wizard/build.gradle b/project_wizard/build.gradle
index ea590c363..4405d7387 100644
--- a/project_wizard/build.gradle
+++ b/project_wizard/build.gradle
@@ -17,7 +17,6 @@ repositories {
 // See https://github.com/JetBrains/gradle-intellij-plugin/
 intellij {
   version = '2020.1'
-  sameSinceUntilBuild = true
 }
 
 buildSearchableOptions {
@@ -26,4 +25,6 @@ buildSearchableOptions {
 
 patchPluginXml {
   version = project.version
+  sinceBuild = '201'
+  untilBuild = '201.*'
 }
\ No newline at end of file
diff --git a/psi_demo/build.gradle b/psi_demo/build.gradle
index ed24c5152..cee49a95c 100644
--- a/psi_demo/build.gradle
+++ b/psi_demo/build.gradle
@@ -18,7 +18,6 @@ repositories {
 intellij {
   version = '2020.1'
   plugins = ['java']
-  sameSinceUntilBuild = true
 }
 
 buildSearchableOptions {
@@ -27,4 +26,6 @@ buildSearchableOptions {
 
 patchPluginXml {
   version = project.version
+  sinceBuild = '201'
+  untilBuild = '201.*'
 }
diff --git a/run_configuration/build.gradle b/run_configuration/build.gradle
index 9092bea0c..f3e2667f7 100644
--- a/run_configuration/build.gradle
+++ b/run_configuration/build.gradle
@@ -17,7 +17,6 @@ repositories {
 // See https://github.com/JetBrains/gradle-intellij-plugin/
 intellij {
   version = '2020.1'
-  sameSinceUntilBuild = true
 }
 
 buildSearchableOptions {
@@ -26,4 +25,6 @@ buildSearchableOptions {
 
 patchPluginXml {
   version = project.version
+  sinceBuild = '201'
+  untilBuild = '201.*'
 }
diff --git a/simple_language_plugin/build.gradle b/simple_language_plugin/build.gradle
index 82e3d0063..b6e8112a1 100644
--- a/simple_language_plugin/build.gradle
+++ b/simple_language_plugin/build.gradle
@@ -34,7 +34,6 @@ dependencies {
 intellij {
   version = '2020.1'
   plugins = ['java']
-  sameSinceUntilBuild = true
 }
 
 buildSearchableOptions {
@@ -43,4 +42,6 @@ buildSearchableOptions {
 
 patchPluginXml {
   version = project.version
+  sinceBuild = '201'
+  untilBuild = '201.*'
 }
diff --git a/tool_window/build.gradle b/tool_window/build.gradle
index 9092bea0c..f3e2667f7 100644
--- a/tool_window/build.gradle
+++ b/tool_window/build.gradle
@@ -17,7 +17,6 @@ repositories {
 // See https://github.com/JetBrains/gradle-intellij-plugin/
 intellij {
   version = '2020.1'
-  sameSinceUntilBuild = true
 }
 
 buildSearchableOptions {
@@ -26,4 +25,6 @@ buildSearchableOptions {
 
 patchPluginXml {
   version = project.version
+  sinceBuild = '201'
+  untilBuild = '201.*'
 }
diff --git a/tree_structure_provider/build.gradle b/tree_structure_provider/build.gradle
index 9092bea0c..f3e2667f7 100644
--- a/tree_structure_provider/build.gradle
+++ b/tree_structure_provider/build.gradle
@@ -17,7 +17,6 @@ repositories {
 // See https://github.com/JetBrains/gradle-intellij-plugin/
 intellij {
   version = '2020.1'
-  sameSinceUntilBuild = true
 }
 
 buildSearchableOptions {
@@ -26,4 +25,6 @@ buildSearchableOptions {
 
 patchPluginXml {
   version = project.version
+  sinceBuild = '201'
+  untilBuild = '201.*'
 }