diff --git a/.github/workflows/dokka_push.yml b/.github/workflows/dokka_push.yml
index 1765eac4775..2b47f8a0cc3 100644
--- a/.github/workflows/dokka_push.yml
+++ b/.github/workflows/dokka_push.yml
@@ -12,7 +12,7 @@ jobs:
         with:
           java-version: 17
       - name: Build
-        run: ./gradlew build && ./gradlew dokkaHtml
+        run: ./gradlew build && ./gradlew :micro_utils.dokka:dokkaGenerate
       - name: Publish KDocs
         uses: peaceiris/actions-gh-pages@v3
         with:
diff --git a/dokka/build.gradle b/dokka/build.gradle
index 81501d643c6..d9cee30203e 100644
--- a/dokka/build.gradle
+++ b/dokka/build.gradle
@@ -17,7 +17,7 @@ kotlin {
         browser()
         nodejs()
     }
-    android {}
+    androidTarget {}
 
     sourceSets {
         commonMain {
@@ -100,14 +100,14 @@ private List<SourceDirectorySet> findSourcesWithName(String... approximateNames)
             }.collect { it.kotlin }
 }
 
-tasks.dokkaHtml {
+dokka {
     dokkaSourceSets {
         configureEach {
             skipDeprecated.set(true)
 
             sourceLink {
                 localDirectory.set(file("../"))
-                remoteUrl.set(new URL("https://github.com/InsanusMokrassar/MicroUtils/blob/master/"))
+                remoteUrl.set(new URI("https://github.com/InsanusMokrassar/MicroUtils/blob/master/"))
                 remoteLineSuffix.set("#L")
             }
         }
@@ -130,4 +130,12 @@ tasks.dokkaHtml {
     }
 }
 
+//dependencies {
+//    project.parent.subprojects.forEach {
+//        if (it != project) {
+//            dokka(it)
+//        }
+//    }
+//}
+
 apply from: "$defaultAndroidSettings"
diff --git a/gradle/templates/defaultProject.gradle b/gradle/templates/defaultProject.gradle
index 810e5cce72b..b190c178c5e 100644
--- a/gradle/templates/defaultProject.gradle
+++ b/gradle/templates/defaultProject.gradle
@@ -1,6 +1,8 @@
 project.version = "$version"
 project.group = "$group"
 
+apply plugin: 'org.jetbrains.dokka'
+
 kotlin {
     sourceSets {
         commonMain {