diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index d074d30b7..b12f85da1 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -4,7 +4,6 @@ import java.net.URL
 import javax.xml.parsers.DocumentBuilderFactory
 import java.io.ByteArrayOutputStream
 import java.io.PrintWriter
-import org.jetbrains.dokka.gradle.AbstractDokkaLeafTask
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet
 import org.jetbrains.kotlin.konan.target.Family
@@ -379,18 +378,23 @@ val downloadWindowsZonesMapping by tasks.registering {
     }
 }
 
-tasks.withType<AbstractDokkaLeafTask>().configureEach {
-    pluginsMapConfiguration.set(mapOf("org.jetbrains.dokka.base.DokkaBase" to """{ "templatesDir" : "${projectDir.toString().replace('\\', '/')}/dokka-templates" }"""))
+dokka {
+    pluginsConfiguration.html {
+        templatesDir.set(projectDir.resolve("dokka-templates"))
+    }
+
+    dokkaPublications.html {
+        failOnWarning.set(true)
+        // Enum members and undocumented toString()
+        suppressInheritedMembers.set(true)
+    }
 
-    failOnWarning.set(true)
     dokkaSourceSets.configureEach {
-        val testSourceSet = kotlin.sourceSets.named("${name.dropLast(4)}Test")
-        samples.from(testSourceSet.map { it.kotlin.srcDirs })
+        val platform = name.dropLast(4)
+        samples.from("$platform/test")
 
         // reportUndocumented.set(true) // much noisy output about `hashCode` and serializer encoders, decoders etc
         skipDeprecated.set(true)
-        // Enum members and undocumented toString()
-        suppressInheritedMembers.set(true)
         // hide the `internal` package, which, on JS, has public members generated by Dukat that would get mentioned
         perPackageOption {
             matchingRegex.set(".*\\.internal(\\..*)?")
@@ -398,7 +402,7 @@ tasks.withType<AbstractDokkaLeafTask>().configureEach {
         }
         sourceLink {
             localDirectory.set(rootDir)
-            remoteUrl.set(URL("https://github.com/kotlin/kotlinx-datetime/tree/latest-release"))
+            remoteUrl("https://github.com/kotlin/kotlinx-datetime/tree/latest-release")
             remoteLineSuffix.set("#L")
         }
     }
diff --git a/gradle.properties b/gradle.properties
index acb732c4a..5673f918b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -21,5 +21,8 @@ kotlin.native.ignoreIncorrectDependencies=true
 kotlin.native.ignoreDisabledTargets=true
 kotlin.mpp.applyDefaultHierarchyTemplate=false
 
+org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
+org.jetbrains.dokka.experimental.gradle.pluginMode.nowarn=true
+
 # stop using pre-HMPP IDEA import workaround in kotlinx.team.infra
 useNativeBuildInfraInIdea=true