diff --git a/buildSrc/src/main/kotlin/artifacts.kt b/buildSrc/src/main/kotlin/artifacts.kt
index 585020f8104..ca87de4a91f 100644
--- a/buildSrc/src/main/kotlin/artifacts.kt
+++ b/buildSrc/src/main/kotlin/artifacts.kt
@@ -111,15 +111,19 @@ fun Project.sourcesJar(body: Jar.() -> Unit = {}): TaskProvider<Jar> {
     return task
 }
 
-fun Project.javadocJar(body: Jar.() -> Unit = {}): TaskProvider<Jar> = getOrCreateTask("javadocJar") {
-    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-    classifier = "javadoc"
-    tasks.findByName("javadoc")?.let { it as Javadoc }?.takeIf { it.enabled }?.let {
-        dependsOn(it)
-        from(it.destinationDir)
+fun Project.javadocJar(body: Jar.() -> Unit = {}): TaskProvider<Jar> {
+    val javadocTask = getOrCreateTask<Jar>("javadocJar") {
+        duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+        archiveClassifier.set("javadoc")
+        tasks.findByName("javadoc")?.let { it as Javadoc }?.takeIf { it.enabled }?.let {
+            dependsOn(it)
+            from(it.destinationDir)
+        }
+        body()
     }
-    body()
-    project.addArtifact("archives", this, this)
+
+    addArtifact("archives", javadocTask)
+    return javadocTask
 }