diff --git a/build.gradle.kts b/build.gradle.kts
index 43899956e94..45a6863b350 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -29,7 +29,7 @@ buildscript {
     dependencies {
         bootstrapCompilerClasspath(kotlin("compiler-embeddable", bootstrapKotlinVersion))
 
-        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.35")
+        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.36")
         classpath(kotlin("gradle-plugin", bootstrapKotlinVersion))
         classpath(kotlin("serialization", bootstrapKotlinVersion))
     }
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 939d46548b6..5080301182c 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -22,7 +22,7 @@ buildscript {
     }
 
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.35")
+        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.36")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${project.bootstrapKotlinVersion}")
         classpath("org.jetbrains.kotlin:kotlin-sam-with-receiver:${project.bootstrapKotlinVersion}")
     }
@@ -149,7 +149,7 @@ java {
 dependencies {
     implementation(kotlin("stdlib", embeddedKotlinVersion))
     implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${project.bootstrapKotlinVersion}")
-    implementation("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.35")
+    implementation("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.36")
     implementation("com.gradle.publish:plugin-publish-plugin:0.20.0")
     implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.6.10")
 
diff --git a/buildSrc/settings.gradle b/buildSrc/settings.gradle
index 2299957b85a..7e92a184469 100644
--- a/buildSrc/settings.gradle
+++ b/buildSrc/settings.gradle
@@ -21,7 +21,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.35")
+        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.36")
     }
 }
 
diff --git a/dependencies/kotlin-build-gradle-plugin/build.gradle.kts b/dependencies/kotlin-build-gradle-plugin/build.gradle.kts
index bc89964c070..969a9238625 100644
--- a/dependencies/kotlin-build-gradle-plugin/build.gradle.kts
+++ b/dependencies/kotlin-build-gradle-plugin/build.gradle.kts
@@ -12,7 +12,7 @@ How to Publish
 2. Prepare publication credentials for https://kotlin.jetbrains.space/p/kotlin/packages/maven/kotlin-dependencies/org.jetbrains.kotlin/kotlin-build-gradle-plugin
 3. Execute `./gradlew -p dependencies/kotlin-build-gradle-plugin publish -PkotlinSpaceUsername=usr -PkotlinSpacePassword=token`
  */
-version = "0.0.35"
+version = "0.0.36"
 
 repositories {
     mavenCentral()
diff --git a/dependencies/kotlin-build-gradle-plugin/src/BuildProperties.kt b/dependencies/kotlin-build-gradle-plugin/src/BuildProperties.kt
index fca6cbdc6b6..a8553de51d6 100644
--- a/dependencies/kotlin-build-gradle-plugin/src/BuildProperties.kt
+++ b/dependencies/kotlin-build-gradle-plugin/src/BuildProperties.kt
@@ -54,7 +54,7 @@ class KotlinBuildProperties(
 
     val buildCacheUrl: String? = getOrNull("kotlin.build.cache.url") as String?
 
-    val pushToBuildCache: Boolean = getBoolean("kotlin.build.cache.push", isTeamcityBuild)
+    val pushToBuildCache: Boolean = getBoolean("kotlin.build.cache.push", false)
 
     val localBuildCacheEnabled: Boolean = getBoolean("kotlin.build.cache.local.enabled", !isTeamcityBuild)
 
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 79206254707..d49b4c45335 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -6369,10 +6369,10 @@
             <sha256 value="2428f57b25b96c229a4219c3e3297bae6049f81f78d3e41eeecf8d6d1103388d" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="kotlin-build-gradle-plugin" version="0.0.35">
-         <artifact name="kotlin-build-gradle-plugin-0.0.35.jar">
-            <md5 value="65fcd53bba3e42eff431bcb3f683c5ef" origin="Generated by Gradle"/>
-            <sha256 value="22a016bf938913f1ca3fabcef752f5b38b9034465f6c99f6b4c5652cce19205d" origin="Generated by Gradle"/>
+      <component group="org.jetbrains.kotlin" name="kotlin-build-gradle-plugin" version="0.0.36">
+         <artifact name="kotlin-build-gradle-plugin-0.0.36.jar">
+            <md5 value="4850a1afdf41e788e99530d0a3d2c7f8" origin="Generated by Gradle"/>
+            <sha256 value="644e32b3d5178a75e5170c5345775081ac1bb466c5729b17f0310e9922f38a3d" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.jetbrains.kotlin" name="kotlin-coroutines-experimental-compat" version="1.4.20">
diff --git a/kotlin-native/performance/build.gradle b/kotlin-native/performance/build.gradle
index f165df8e71f..930df6cdd91 100644
--- a/kotlin-native/performance/build.gradle
+++ b/kotlin-native/performance/build.gradle
@@ -31,7 +31,7 @@ buildscript {
     }
 
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.35")
+        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.36")
     }
 }
 
diff --git a/kotlin-native/performance/buildSrc/build.gradle.kts b/kotlin-native/performance/buildSrc/build.gradle.kts
index 8aad4736e78..9346971bbe4 100644
--- a/kotlin-native/performance/buildSrc/build.gradle.kts
+++ b/kotlin-native/performance/buildSrc/build.gradle.kts
@@ -30,7 +30,7 @@ buildscript {
     }
 
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.35")
+        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.36")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${project.bootstrapKotlinVersion}")
     }
 }
@@ -81,7 +81,7 @@ tasks.withType<KotlinCompile>().configureEach {
 
 
 dependencies {
-    implementation("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.35")
+    implementation("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.36")
     implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${project.bootstrapKotlinVersion}")
     api("org.jetbrains.kotlin:kotlin-native-utils:${project.bootstrapKotlinVersion}")
     api("org.jetbrains.kotlin:kotlin-util-klib:${project.bootstrapKotlinVersion}")
diff --git a/kotlin-native/performance/buildSrc/settings.gradle.kts b/kotlin-native/performance/buildSrc/settings.gradle.kts
index 6866e3470e3..9dc1f9ba50e 100644
--- a/kotlin-native/performance/buildSrc/settings.gradle.kts
+++ b/kotlin-native/performance/buildSrc/settings.gradle.kts
@@ -14,7 +14,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.35")
+        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.36")
     }
 }
 
diff --git a/kotlin-native/tools/benchmarksAnalyzer/buildSrc/build.gradle.kts b/kotlin-native/tools/benchmarksAnalyzer/buildSrc/build.gradle.kts
index fd2b54599b0..824f1395906 100644
--- a/kotlin-native/tools/benchmarksAnalyzer/buildSrc/build.gradle.kts
+++ b/kotlin-native/tools/benchmarksAnalyzer/buildSrc/build.gradle.kts
@@ -32,7 +32,7 @@ buildscript {
     }
 
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.35")
+        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.36")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${project.bootstrapKotlinVersion}")
     }
 }
@@ -82,7 +82,7 @@ tasks.withType<KotlinCompile>().configureEach {
 }
 
 dependencies {
-    implementation("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.35")
+    implementation("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.36")
     implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${project.bootstrapKotlinVersion}")
     api("org.jetbrains.kotlin:kotlin-native-utils:${project.bootstrapKotlinVersion}")
     api("org.jetbrains.kotlin:kotlin-util-klib:${project.bootstrapKotlinVersion}")
diff --git a/kotlin-native/tools/benchmarksAnalyzer/buildSrc/settings.gradle.kts b/kotlin-native/tools/benchmarksAnalyzer/buildSrc/settings.gradle.kts
index a154086b4f8..0a67f983b25 100644
--- a/kotlin-native/tools/benchmarksAnalyzer/buildSrc/settings.gradle.kts
+++ b/kotlin-native/tools/benchmarksAnalyzer/buildSrc/settings.gradle.kts
@@ -13,6 +13,6 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.35")
+        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.36")
     }
 }
diff --git a/kotlin-native/tools/performance-server/buildSrc/build.gradle.kts b/kotlin-native/tools/performance-server/buildSrc/build.gradle.kts
index b7d1fc9c656..6f1be317e57 100644
--- a/kotlin-native/tools/performance-server/buildSrc/build.gradle.kts
+++ b/kotlin-native/tools/performance-server/buildSrc/build.gradle.kts
@@ -30,7 +30,7 @@ buildscript {
     }
 
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.35")
+        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.36")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${project.bootstrapKotlinVersion}")
     }
 }
@@ -80,7 +80,7 @@ tasks.withType<KotlinCompile>().configureEach {
 }
 
 dependencies {
-    implementation("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.35")
+    implementation("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.36")
     implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${project.bootstrapKotlinVersion}")
     api("org.jetbrains.kotlin:kotlin-native-utils:${project.bootstrapKotlinVersion}")
     api("org.jetbrains.kotlin:kotlin-util-klib:${project.bootstrapKotlinVersion}")
diff --git a/kotlin-native/tools/performance-server/buildSrc/settings.gradle.kts b/kotlin-native/tools/performance-server/buildSrc/settings.gradle.kts
index a154086b4f8..0a67f983b25 100644
--- a/kotlin-native/tools/performance-server/buildSrc/settings.gradle.kts
+++ b/kotlin-native/tools/performance-server/buildSrc/settings.gradle.kts
@@ -13,6 +13,6 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.35")
+        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.36")
     }
 }
diff --git a/kotlin-native/tools/performance-server/ui/buildSrc/build.gradle.kts b/kotlin-native/tools/performance-server/ui/buildSrc/build.gradle.kts
index 52e4f74606d..48a160099a8 100644
--- a/kotlin-native/tools/performance-server/ui/buildSrc/build.gradle.kts
+++ b/kotlin-native/tools/performance-server/ui/buildSrc/build.gradle.kts
@@ -29,7 +29,7 @@ buildscript {
     }
 
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.35")
+        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.36")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${project.bootstrapKotlinVersion}")
     }
 }
@@ -78,7 +78,7 @@ tasks.withType<KotlinCompile>().configureEach {
 }
 
 dependencies {
-    implementation("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.35")
+    implementation("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.36")
     implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${project.bootstrapKotlinVersion}")
     api("org.jetbrains.kotlin:kotlin-native-utils:${project.bootstrapKotlinVersion}")
     api("org.jetbrains.kotlin:kotlin-util-klib:${project.bootstrapKotlinVersion}")
diff --git a/kotlin-native/tools/performance-server/ui/buildSrc/settings.gradle.kts b/kotlin-native/tools/performance-server/ui/buildSrc/settings.gradle.kts
index acae0454dfc..8ce0c378015 100644
--- a/kotlin-native/tools/performance-server/ui/buildSrc/settings.gradle.kts
+++ b/kotlin-native/tools/performance-server/ui/buildSrc/settings.gradle.kts
@@ -22,6 +22,6 @@ buildscript {
         }
     }
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.35")
+        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.36")
     }
 }
diff --git a/native/commonizer-api/build.gradle.kts b/native/commonizer-api/build.gradle.kts
index a23ed9ede48..d1eaafe34b1 100644
--- a/native/commonizer-api/build.gradle.kts
+++ b/native/commonizer-api/build.gradle.kts
@@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.utils.NativeCompilerDownloader
 buildscript {
     val cacheRedirectorEnabled = findProperty("cacheRedirectorEnabled")?.toString()?.toBoolean() ?: false
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.35")
+        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.36")
     }
     repositories {
         if (cacheRedirectorEnabled)
diff --git a/settings.gradle b/settings.gradle
index 37c8115ebbe..110a4e7bcf2 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -28,7 +28,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.35")
+        classpath("org.jetbrains.kotlin:kotlin-build-gradle-plugin:0.0.36")
     }
 }