diff --git a/build.gradle.kts b/build.gradle.kts
index 7d473f6..7a49d0a 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -23,6 +23,7 @@ buildscript {
         google()
         maven  ("https://kotlin.bintray.com/kotlinx")
         maven ("https://dl.bintray.com/kotlin/kotlin-eap")
+        maven ("https://dl.bintray.com/kotlin/kotlin-dev")
         gradlePluginPortal()
         jcenter()
     }
@@ -30,6 +31,7 @@ buildscript {
     dependencies {
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}")
         classpath ("gradle.plugin.org.jlleitschuh.gradle:ktlint-gradle:5.0.0")
+        classpath ("org.jetbrains.dokka:dokka-gradle-plugin:${Versions.dokkaPlugin}")
     }
 }
 
@@ -40,7 +42,7 @@ allprojects {
         google()
         maven ("https://kotlin.bintray.com/kotlinx")
         maven ("https://dl.bintray.com/kotlin/kotlin-eap")
-        maven ("https://kotlin.bintray.com/kotlin-dev")
+        maven ("https://dl.bintray.com/kotlin/kotlin-dev")
         jcenter()
         maven {
             url = uri("https://oss.sonatype.org/content/repositories/snapshots")
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 35e8766..1ed63da 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -23,6 +23,7 @@ plugins {
 repositories {
     mavenCentral()
     maven ("https://dl.bintray.com/kotlin/kotlin-eap")
+    maven("https://dl.bintray.com/kotlin/kotlin-dev")
     jcenter()
 }
 
diff --git a/buildSrc/src/main/kotlin/Deps.kt b/buildSrc/src/main/kotlin/Deps.kt
index 550f95b..1c80a48 100644
--- a/buildSrc/src/main/kotlin/Deps.kt
+++ b/buildSrc/src/main/kotlin/Deps.kt
@@ -20,7 +20,7 @@ object Versions {
     val kotlinSerialization = "0.20.0-1.4-M2"
     val atomicfu = "0.14.3-M2-2-SNAPSHOT" //NOTE: my linux arm32 and arm64 build
     val nodePlugin = "1.3.0"
-    val dokkaPlugin = "0.9.18"
+    val dokkaPlugin = "0.11.0-dev-44"
     val taskTreePlugin = "1.5"
 
     val kotlinBigNumVersion = "0.1.6-1.4-M2-SNAPSHOT"
diff --git a/multiplatform-crypto-api/build.gradle.kts b/multiplatform-crypto-api/build.gradle.kts
index a689963..4ec7aba 100644
--- a/multiplatform-crypto-api/build.gradle.kts
+++ b/multiplatform-crypto-api/build.gradle.kts
@@ -24,7 +24,7 @@ plugins {
     kotlin(PluginsDeps.multiplatform)
     id (PluginsDeps.mavenPublish)
     id (PluginsDeps.signing)
-    id (PluginsDeps.dokka) version Versions.dokkaPlugin
+    id (PluginsDeps.dokka)
 }
 
 repositories {
@@ -275,16 +275,7 @@ tasks {
     }
 
     dokka {
-        println ("Dokka !")
-        impliedPlatforms = mutableListOf("Common")
-        kotlinTasks {
-            listOf()
-        }
-        sourceRoot {
-            println ("Common !")
-            path = "/home/ionspin/Projects/Future/kotlin-multiplatform-crypto/crypto/src/commonMain" //TODO remove static path!
-            platforms = listOf("Common")
-        }
+        println("Dokka !")
     }
     if (getHostOsName() == "linux" && getHostArchitecture() == "x86-64") {
 
diff --git a/multiplatform-crypto-delegated/build.gradle.kts b/multiplatform-crypto-delegated/build.gradle.kts
index e4cac24..ddfc8a8 100644
--- a/multiplatform-crypto-delegated/build.gradle.kts
+++ b/multiplatform-crypto-delegated/build.gradle.kts
@@ -26,7 +26,7 @@ plugins {
     id(PluginsDeps.mavenPublish)
     id(PluginsDeps.signing)
     id(PluginsDeps.node) version Versions.nodePlugin
-    id(PluginsDeps.dokka) version Versions.dokkaPlugin
+    id(PluginsDeps.dokka)
     id(PluginsDeps.taskTree) version Versions.taskTreePlugin
 }
 
@@ -542,6 +542,7 @@ tasks {
     }
 
     dokka {
+        println("Dokka !")
     }
     if (getHostOsName() == "linux" && getHostArchitecture() == "x86-64") {
         val jvmTest by getting(Test::class) {
diff --git a/multiplatform-crypto/build.gradle.kts b/multiplatform-crypto/build.gradle.kts
index cd14d94..81084a3 100644
--- a/multiplatform-crypto/build.gradle.kts
+++ b/multiplatform-crypto/build.gradle.kts
@@ -24,7 +24,7 @@ plugins {
     id(PluginsDeps.mavenPublish)
     id(PluginsDeps.signing)
     id(PluginsDeps.node) version Versions.nodePlugin
-    id(PluginsDeps.dokka) version Versions.dokkaPlugin
+    id(PluginsDeps.dokka)
 }
 
 val sonatypeStaging = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
@@ -369,16 +369,6 @@ tasks {
 
     dokka {
         println("Dokka !")
-        impliedPlatforms = mutableListOf("Common")
-        kotlinTasks {
-            listOf()
-        }
-        sourceRoot {
-            println("Common !")
-            path =
-                "/home/ionspin/Projects/Future/kotlin-multiplatform-crypto/crypto/src/commonMain" //TODO remove static path!
-            platforms = listOf("Common")
-        }
     }
     if (getHostOsName() == "linux" && getHostArchitecture() == "x86-64") {
 
diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts
index 06a23de..96cfab1 100644
--- a/sample/build.gradle.kts
+++ b/sample/build.gradle.kts
@@ -25,7 +25,6 @@ plugins {
     id (PluginsDeps.mavenPublish)
     id (PluginsDeps.signing)
     id (PluginsDeps.node) version Versions.nodePlugin
-    id (PluginsDeps.dokka) version Versions.dokkaPlugin
 }
 
 val sonatypeStaging = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
@@ -279,12 +278,6 @@ kotlin {
 tasks {
 
 
-    create<Jar>("javadocJar") {
-        dependsOn(dokka)
-        archiveClassifier.set("javadoc")
-        from(dokka.get().outputDirectory)
-    }
-
     if (getHostOsName() == "linux") {
 
 
diff --git a/settings.gradle.kts b/settings.gradle.kts
index fa503b5..92e8084 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -18,6 +18,7 @@
 pluginManagement {
     repositories {
         maven("https://dl.bintray.com/kotlin/kotlin-eap")
+        maven("https://dl.bintray.com/kotlin/kotlin-dev")
 
         mavenCentral()