diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b3fe20d5..5f0a6131 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -71,10 +71,10 @@ jobs:
         with:
           fetch-depth: 0
       - uses: "./.github/actions/setup"
-      - run: "./gradlew dokkaHtmlMultiModule"
+      - run: "./gradlew :dokkaGenerate"
       - uses: "actions/upload-pages-artifact@v3"
         with:
-          path: "build/dokka/htmlMultiModule"
+          path: "build/dokka/html"
 
   build-android-app:
     runs-on: "ubuntu-latest"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 7937b63f..97771d47 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -38,9 +38,9 @@ jobs:
         with:
           fetch-depth: 0
       - uses: "./.github/actions/setup"
-      - run: "./gradlew dokkaHtmlMultiModule"
+      - run: "./gradlew :dokkaGenerate"
       - uses: "actions/upload-pages-artifact@v3"
         with:
-          path: "build/dokka/htmlMultiModule"
+          path: "build/dokka/html"
       - uses: "actions/deploy-pages@v4"
         id: "deploy-pages"
diff --git a/build.gradle.kts b/build.gradle.kts
index 246ef641..91e137cb 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -11,6 +11,10 @@ plugins {
   alias(libs.plugins.dokka)
 }
 
+dokka { moduleName = "MapLibre Compose" }
+
+dependencies { dokka(project(":lib:maplibre-compose:")) }
+
 spotless {
   kotlinGradle { ktfmt().googleStyle() }
   format("swift") {
diff --git a/gradle.properties b/gradle.properties
index 9a7a9e3c..62d5d75b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,7 @@
 LIBRARY_VERSION=0.1.1-SNAPSHOT
 kotlin.code.style=official
 kotlin.daemon.jvmargs=-Xmx2048M
+org.jetbrains.dokka.experimental.gradle.pluginMode=V2EnabledWithHelpers
 # Blocker: https://github.com/diffplug/spotless/issues/2347
 org.gradle.configuration-cache=false
 org.gradle.jvmargs=-Xmx2048M -Dfile.encoding=UTF-8
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index d2c92215..c39cc868 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -27,7 +27,7 @@ spatialk-geojson = { group = "io.github.dellisd.spatialk", name = "geojson", ver
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }
 android-library = { id = "com.android.library", version.ref = "agp" }
-dokka = { id = "org.jetbrains.dokka", version = "1.9.20" }
+dokka = { id = "org.jetbrains.dokka", version = "2.0.0-Beta" }
 jetbrains-compose = { id = "org.jetbrains.compose", version.ref = "compose" }
 jgitver = { id = "fr.brouillard.oss.gradle.jgitver", version = "0.10.0-rc03" }
 kotlin-cocoapods = { id = "org.jetbrains.kotlin.native.cocoapods", version.ref = "kotlin" }