diff --git a/buildSrc/src/main/kotlin/BuildPropertiesExt.kt b/buildSrc/src/main/kotlin/BuildPropertiesExt.kt
index f0ad901fcd2..0c3e98003bd 100644
--- a/buildSrc/src/main/kotlin/BuildPropertiesExt.kt
+++ b/buildSrc/src/main/kotlin/BuildPropertiesExt.kt
@@ -52,8 +52,10 @@ val KotlinBuildProperties.isNativeRuntimeDebugInfoEnabled: Boolean
 val KotlinBuildProperties.junit5NumberOfThreadsForParallelExecution: Int?
     get() = (getOrNull("kotlin.test.junit5.maxParallelForks") as? String)?.toInt()
 
+// Enabling publishing docs jars only on CI build by default
+// Currently dokka task runs non-incrementally and takes big amount of time
 val KotlinBuildProperties.publishGradlePluginsJavadoc: Boolean
-    get() = getBoolean("kotlin.build.gradle.publish.javadocs", false)
+    get() = getBoolean("kotlin.build.gradle.publish.javadocs", isTeamcityBuild)
 
 val KotlinBuildProperties.useFirWithLightTree: Boolean
     get() = getBoolean("kotlin.build.useFirLT")
diff --git a/buildSrc/src/main/kotlin/GradleCommon.kt b/buildSrc/src/main/kotlin/GradleCommon.kt
index 6b13e2a5458..46a0c36d1ff 100644
--- a/buildSrc/src/main/kotlin/GradleCommon.kt
+++ b/buildSrc/src/main/kotlin/GradleCommon.kt
@@ -282,11 +282,7 @@ fun Project.reconfigureMainSourcesSetForGradlePlugin(
                 .extensions
                 .configure<JavaPluginExtension> {
                     withSourcesJar()
-                    // Enabling publishing docs jars only on CI build
-                    // Currently dokka task runs non-incrementally and takes big amount of time
-                    if (kotlinBuildProperties.publishGradlePluginsJavadoc ||
-                        kotlinBuildProperties.isTeamcityBuild
-                    ) {
+                    if (kotlinBuildProperties.publishGradlePluginsJavadoc) {
                         withJavadocJar()
                     }
                 }
@@ -346,11 +342,7 @@ fun Project.createGradlePluginVariant(
                     capability(project.group.toString(), project.name, project.version.toString())
                 }
 
-                // Enabling publishing docs jars only on CI build
-                // Currently dokka task runs non-incrementally and takes big amount of time
-                if (kotlinBuildProperties.publishGradlePluginsJavadoc ||
-                    kotlinBuildProperties.isTeamcityBuild
-                ) {
+                if (kotlinBuildProperties.publishGradlePluginsJavadoc) {
                     withJavadocJar()
                 }
                 withSourcesJar()
@@ -365,11 +357,7 @@ fun Project.createGradlePluginVariant(
         }
     }
 
-    // Enabling publishing docs jars only on CI build
-    // Currently dokka task runs non-incrementally and takes big amount of time
-    if (kotlinBuildProperties.publishGradlePluginsJavadoc ||
-        kotlinBuildProperties.isTeamcityBuild
-    ) {
+    if (kotlinBuildProperties.publishGradlePluginsJavadoc) {
         plugins.withId("org.jetbrains.dokka") {
             val dokkaTask = tasks.register<DokkaTask>("dokka${variantSourceSet.javadocTaskName.capitalize()}") {
                 description = "Generates documentation in 'javadoc' format for '${variantSourceSet.javadocTaskName}' variant"