diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 3a7616390a3..e2082dcc572 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -166,7 +166,7 @@ dependencies {
     implementation(kotlin("stdlib", embeddedKotlinVersion))
     implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${project.bootstrapKotlinVersion}")
     implementation("org.jetbrains.kotlin:kotlin-build-gradle-plugin:${kotlinBuildProperties.buildGradlePluginVersion}")
-    implementation("com.gradle.publish:plugin-publish-plugin:0.20.0")
+    implementation("com.gradle.publish:plugin-publish-plugin:1.0.0-rc-3")
     implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.6.10")
 
     implementation("net.rubygrapefruit:native-platform:${property("versions.native-platform")}")
diff --git a/buildSrc/src/main/kotlin/GradleCommon.kt b/buildSrc/src/main/kotlin/GradleCommon.kt
index 59ddaae202f..d44e394de28 100644
--- a/buildSrc/src/main/kotlin/GradleCommon.kt
+++ b/buildSrc/src/main/kotlin/GradleCommon.kt
@@ -287,22 +287,26 @@ fun Project.reconfigureMainSourcesSetForGradlePlugin(
                 }
         }
 
-        plugins.withId("org.jetbrains.dokka") {
-            val dokkaTask = tasks.named<DokkaTask>("dokkaJavadoc") {
-                dokkaSourceSets {
-                    named(commonSourceSet.name) {
-                        suppress.set(false)
-                    }
+        if (kotlinBuildProperties.publishGradlePluginsJavadoc ||
+            kotlinBuildProperties.isTeamcityBuild
+        ) {
+            plugins.withId("org.jetbrains.dokka") {
+                val dokkaTask = tasks.named<DokkaTask>("dokkaJavadoc") {
+                    dokkaSourceSets {
+                        named(commonSourceSet.name) {
+                            suppress.set(false)
+                        }
 
-                    named("main") {
-                        dependsOn(commonSourceSet)
+                        named("main") {
+                            dependsOn(commonSourceSet)
+                        }
                     }
                 }
-            }
 
-            tasks.withType<Jar>().configureEach {
-                if (name == javadocJarTaskName) {
-                    from(dokkaTask.flatMap { it.outputDirectory })
+                tasks.withType<Jar>().configureEach {
+                    if (name == javadocJarTaskName) {
+                        from(dokkaTask.flatMap { it.outputDirectory })
+                    }
                 }
             }
         }
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index e4d1ec8ec7d..55555655070 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -2110,10 +2110,10 @@
             <sha256 value="d4b1fb131e50a0579400bf915066e7dd03ad856e5d5bd0556bdde3df0654449e" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.gradle.publish" name="plugin-publish-plugin" version="0.20.0">
-         <artifact name="plugin-publish-plugin-0.20.0.jar">
-            <md5 value="7332672ea82e8ba857b8474837deae6e" origin="Generated by Gradle"/>
-            <sha256 value="e71dc838ada62842fb9d1ea3f64a5615d09a032adb7f7e6a9e52235e9a80e77d" origin="Generated by Gradle"/>
+      <component group="com.gradle.publish" name="plugin-publish-plugin" version="1.0.0-rc-3">
+         <artifact name="plugin-publish-plugin-1.0.0-rc-3.jar">
+            <md5 value="e8f8cf5cc8cab2b7df87b227772a9089" origin="Generated by Gradle"/>
+            <sha256 value="3441a5772dcb9461146aa59caf2eb5a665826ed393340d10b16f1346d11340c0" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="com.ibm.icu" name="icu4j" version="53.1">