diff --git a/buildSrc/src/main/kotlin/konstraints.kotlin-library.gradle.kts b/buildSrc/src/main/kotlin/konstraints.kotlin-library.gradle.kts
index 25565d7..d5e0c23 100644
--- a/buildSrc/src/main/kotlin/konstraints.kotlin-library.gradle.kts
+++ b/buildSrc/src/main/kotlin/konstraints.kotlin-library.gradle.kts
@@ -25,6 +25,7 @@ plugins {
   kotlin("jvm")
 
   id("org.jetbrains.dokka")
+  id("org.jetbrains.dokka-javadoc")
 }
 
 val libs = the<LibrariesForLibs>()
@@ -41,7 +42,7 @@ val kdocJar: TaskProvider<Jar> by
     tasks.registering(Jar::class) {
       group = DOCUMENTATION_GROUP
       archiveClassifier = "kdoc"
-      from(tasks.dokkaHtml.flatMap { it.outputDirectory })
+      from(tasks.dokkaGeneratePublicationHtml.flatMap { it.outputDirectory })
     }
 
 val kdoc: Configuration by
@@ -55,7 +56,7 @@ artifacts { add(kdoc.name, kdocJar) }
 tasks.register("javadocJar", Jar::class) {
   group = DOCUMENTATION_GROUP
   archiveClassifier = "javadoc"
-  from(tasks.dokkaJavadoc.flatMap { it.outputDirectory })
+  from(tasks.dokkaGeneratePublicationJavadoc.flatMap { it.outputDirectory })
 }
 
 java {
diff --git a/gradle.properties b/gradle.properties
index 9809c44..ebaf161 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -14,4 +14,5 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-org.gradle.jvmargs=-Xmx1G
\ No newline at end of file
+org.gradle.jvmargs=-Xmx1G
+org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled