diff --git a/build.gradle.kts b/build.gradle.kts
index e8c9ac3e782..7544b23f471 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -422,6 +422,9 @@ allprojects {
         register("listRuntimeJar") { listConfigurationContents("runtimeJar") }
 
         register("listDistJar") { listConfigurationContents("distJar") }
+
+        // Aggregate task for build related checks
+        register("checkBuild")
     }
 
     afterEvaluate {
@@ -458,9 +461,6 @@ allprojects {
                 ?.exclude("org.jetbrains.kotlin", "kotlin-scripting-compiler-embeddable")
         }
 
-        // Aggregate task for build related checks
-        tasks.register("checkBuild")
-
         apply(from = "$rootDir/gradle/cacheRedirector.gradle.kts")
     }
 }
@@ -753,6 +753,14 @@ tasks {
     register("check") {
         dependsOn("test")
     }
+
+    named("checkBuild") {
+        if (kotlinBuildProperties.isTeamcityBuild) {
+            doFirst {
+                println("##teamcity[setParameter name='bootstrap.kotlin.version' value='$bootstrapKotlinVersion']")
+            }
+        }
+    }
 }
 
 fun CopySpec.setExecutablePermissions() {