diff --git a/.idea/dictionaries/project.xml b/.idea/dictionaries/project.xml
new file mode 100644
index 00000000000..481f83759dc
--- /dev/null
+++ b/.idea/dictionaries/project.xml
@@ -0,0 +1,7 @@
+<component name="ProjectDictionaryState">
+  <dictionary name="project">
+    <words>
+      <w>nmcppublishaggregationtocentralportal</w>
+    </words>
+  </dictionary>
+</component>
\ No newline at end of file
diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts
index b60dea25553..1674e2ae68c 100644
--- a/build-logic/build.gradle.kts
+++ b/build-logic/build.gradle.kts
@@ -21,6 +21,7 @@ dependencies {
   // We add all the plugins to the classpath here so that they are loaded with proper conflict resolution
   // See https://github.com/gradle/gradle/issues/4741
   implementation(libs.okhttp)
+  implementation(libs.dokka)
 
   /**
    * Ktor for the websocket tests in integration tests
@@ -30,7 +31,6 @@ dependencies {
   implementation(libs.ktor.server.websockets)
 
   implementation(libs.kotlinx.benchmark)
-  implementation(libs.dokka)
   implementation(libs.licensee)
   implementation(libs.apollo.execution.gradle.plugin)
   implementation(libs.compat.patrouille)
diff --git a/build-logic/src/main/kotlin/Publishing.kt b/build-logic/src/main/kotlin/Publishing.kt
index 35fd0365247..d8b251fa05a 100644
--- a/build-logic/src/main/kotlin/Publishing.kt
+++ b/build-logic/src/main/kotlin/Publishing.kt
@@ -70,14 +70,6 @@ fun Project.configureDokkaCommon(): DokkaExtension {
     includes.from("README.md")
   }
 
-  // Workaround for https://github.com/adamko-dev/dokkatoo/issues/165
-  configurations.configureEach {
-    if (name.lowercase().contains("dokkaHtmlPublicationPluginApiOnlyConsumable~internal".lowercase())) {
-      attributes {
-        attribute(Usage.USAGE_ATTRIBUTE, objects.named(Usage::class.java, "poison"))
-      }
-    }
-  }
   return dokka
 }
 
diff --git a/gradle/libraries.toml b/gradle/libraries.toml
index 90d7ee0642e..da66aae3e74 100644
--- a/gradle/libraries.toml
+++ b/gradle/libraries.toml
@@ -94,7 +94,6 @@ benmanes-versions = { group = "com.github.ben-manes", name = "gradle-versions-pl
 compat-patrouille = { module = "com.gradleup.compat.patrouille:compat-patrouille-gradle-plugin", version.ref = "compat-patrouille" }
 compose-runtime = { group = "androidx.compose.runtime", name = "runtime", version.ref = "compose" }
 compose-ui = { group = "androidx.compose.ui", name = "ui", version.ref = "compose" }
-dokka = "org.jetbrains.dokka:dokka-gradle-plugin:2.0.0"
 dgp = "com.gradle:develocity-gradle-plugin:4.2" # // sync with settings.gradle.kts
 # Not updating because it fails in apollo-compiler Java tests with
 # annotation @org.jetbrains.annotations.Nullable not applicable in this type context
@@ -104,7 +103,9 @@ gratatouille = { group = "com.gradleup.gratatouille", name = "gratatouille-gradl
 gratatouille-wiring-runtime = { group = "com.gradleup.gratatouille", name = "gratatouille-wiring-runtime", version.ref = "gratatouille-runtime" }
 gratatouille-tasks-runtime = { group = "com.gradleup.gratatouille", name = "gratatouille-tasks-runtime", version.ref = "gratatouille-runtime" }
 jsr305 = "com.google.code.findbugs:jsr305:3.0.2"
-
+# built from https://github.com/apollographql/dokka/releases/tag/v2.1.0-beta.2
+# remove when https://github.com/Kotlin/dokka/pull/4286 is merged
+dokka = "org.jetbrains.dokka:org.jetbrains.dokka.gradle.plugin:2.1.0-beta.2"
 #
 # See https://github.com/gradle/gradle/issues/1835
 # We use the Nokee[redistributed artifacts](https://docs.nokee.dev/manual/gradle-plugin-development.html#sec:gradle-dev-redistributed-gradle-api)
@@ -176,7 +177,7 @@ androidx-test-runner = "androidx.test:runner:1.7.0"
 truth = { group = "com.google.truth", name = "truth", version.ref = "truth" }
 turbine = { group = "app.cash.turbine", name = "turbine", version = "1.2.1" }
 uuid = { group = "com.benasher44", name = "uuid", version = "0.8.4" }
-librarian = "com.gradleup.librarian:librarian-gradle-plugin:0.1.1-SNAPSHOT-a304cd71c6b81d4cb3bba72e85b70fdb74eae70c"
+librarian = "com.gradleup.librarian:librarian-gradle-plugin:0.2.0"
 nmcp = "com.gradleup.nmcp:nmcp:1.1.0"
 slf4j-simple = "org.slf4j:slf4j-simple:2.0.17"
 slf4j-nop = "org.slf4j:slf4j-nop:2.0.17"
diff --git a/gradle/repositories.gradle.kts b/gradle/repositories.gradle.kts
index 35e104b5074..d2bdef5c234 100644
--- a/gradle/repositories.gradle.kts
+++ b/gradle/repositories.gradle.kts
@@ -60,6 +60,11 @@ listOf(pluginManagement.repositories, dependencyResolutionManagement.repositorie
           includeGroup("com.gradleup.gratatouille.wiring")
         }
       }
+      maven("https://storage.googleapis.com/apollo-previews/m2") {
+        content {
+          includeGroup("org.jetbrains.dokka")
+        }
+      }
     }
   }
 }
diff --git a/libraries/apollo-engine-tests/build.gradle.kts b/libraries/apollo-engine-tests/build.gradle.kts
index 547f9ae2d96..6cf6bc4be12 100644
--- a/libraries/apollo-engine-tests/build.gradle.kts
+++ b/libraries/apollo-engine-tests/build.gradle.kts
@@ -1,4 +1,4 @@
-import com.gradleup.librarian.core.tooling.init.kotlinPluginVersion
+import org.jetbrains.kotlin.gradle.plugin.getKotlinPluginVersion
 
 plugins {
   id("org.jetbrains.kotlin.multiplatform")
@@ -16,7 +16,7 @@ kotlin {
       dependencies {
         api(project(":apollo-runtime"))
         implementation(libs.apollo.mockserver)
-        implementation("org.jetbrains.kotlin:kotlin-test:$kotlinPluginVersion")
+        implementation("org.jetbrains.kotlin:kotlin-test:${getKotlinPluginVersion()}")
       }
     }
     findByName("commonTest")?.apply {