diff --git a/docs/build.gradle b/docs/build.gradle
index 32373a856f..1f1541124b 100644
--- a/docs/build.gradle
+++ b/docs/build.gradle
@@ -43,16 +43,15 @@ kotlin {
     }
 }
 
-private Closure includeSourcesInDokka(String approximateName) {
+private Closure includeSourcesInDokka(String... approximateNames) {
     return {
         parent.subprojects.forEach {
             if (it != project) {
                 File srcDir = new File(it.projectDir.absolutePath, "src")
                 if (srcDir.exists() && srcDir.isDirectory()) {
-                    srcDir.eachFile {
-                        println(it.absolutePath)
-                        if (it.name.contains(approximateName) && it.isDirectory()) {
-                            String pathToSrc = it.absolutePath
+                    srcDir.eachFile { file ->
+                        if (approximateNames.any { file.name.contains(it) } && file.isDirectory()) {
+                            String pathToSrc = file.absolutePath
                             sourceRoot {
                                 path = pathToSrc
                             }
@@ -67,7 +66,6 @@ private Closure includeSourcesInDokka(String approximateName) {
 dokka {
     outputFormat = 'html'
     outputDirectory = "$buildDir/dokka"
-    disableAutoconfiguration = true
 
     multiplatform {
         global {
@@ -81,7 +79,7 @@ dokka {
         }
 
         common(includeSourcesInDokka("commonMain"))
-        js(includeSourcesInDokka("jsMain"))
-        jvm(includeSourcesInDokka("jvmMain"))
+        js(includeSourcesInDokka("jsMain"/*, "commonMain"*/))
+        jvm(includeSourcesInDokka("jvmMain"/*, "commonMain"*/))
     }
 }
diff --git a/docs/gradle.properties b/docs/gradle.properties
index 8bc46f176d..3e3f5a7521 100644
--- a/docs/gradle.properties
+++ b/docs/gradle.properties
@@ -1 +1,3 @@
 dokka_version=0.10.1
+
+org.gradle.jvmargs=-Xmx1024m