diff --git a/build.gradle.kts b/build.gradle.kts
index 1be80bfaed..e88bc01427 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,7 +5,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 plugins {
     kotlin("jvm") apply false
     id("java")
-    id("org.jetbrains.dokka") version "1.4.10.2"
+    id("org.jetbrains.dokka") version "1.4.20"
 }
 
 val dokka_version: String by project
diff --git a/buildSrc/src/main/kotlin/org/jetbrains/DokkaPublicationChannel.kt b/buildSrc/src/main/kotlin/org/jetbrains/DokkaPublicationChannel.kt
index d157445b0a..853267f742 100644
--- a/buildSrc/src/main/kotlin/org/jetbrains/DokkaPublicationChannel.kt
+++ b/buildSrc/src/main/kotlin/org/jetbrains/DokkaPublicationChannel.kt
@@ -4,7 +4,7 @@ package org.jetbrains
 
 import org.gradle.api.Project
 
-internal enum class DokkaPublicationChannel {
+enum class DokkaPublicationChannel {
     SpaceDokkaDev,
     BintrayKotlinDev,
     BintrayKotlinEap,
@@ -39,7 +39,7 @@ internal enum class DokkaPublicationChannel {
     }
 }
 
-internal val Project.publicationChannels: Set<DokkaPublicationChannel>
+val Project.publicationChannels: Set<DokkaPublicationChannel>
     get() {
         val publicationChannel = this.properties["dokka_publication_channel"]?.toString()
         val publicationChannels = this.properties["dokka_publication_channels"]?.toString()
diff --git a/buildSrc/src/main/kotlin/org/jetbrains/publication.kt b/buildSrc/src/main/kotlin/org/jetbrains/publication.kt
index 399252b47d..44ced34eb0 100644
--- a/buildSrc/src/main/kotlin/org/jetbrains/publication.kt
+++ b/buildSrc/src/main/kotlin/org/jetbrains/publication.kt
@@ -152,7 +152,7 @@ private fun Project.configureSonatypePublication(vararg publications: String) {
     }
 }
 
-private fun MavenPublication.configurePom(projectName: String) {
+fun MavenPublication.configurePom(projectName: String) {
     pom {
         name.set(projectName)
         description.set("Dokka is a documentation engine for Kotlin and Java, performing the same function as Javadoc for Java")
@@ -184,13 +184,17 @@ private fun MavenPublication.configurePom(projectName: String) {
 
 @Suppress("UnstableApiUsage")
 private fun Project.signPublicationsIfKeyPresent(vararg publications: String) {
-    val signingKeyId = System.getenv("SIGN_KEY_ID")
-    val signingKey = System.getenv("SIGN_KEY")
-    val signingKeyPassphrase = System.getenv("SIGN_KEY_PASSPHRASE")
+    val signingKeyId: String? = System.getenv("SIGN_KEY_ID")
+    val signingKey: String? = System.getenv("SIGN_KEY")
+    val signingKeyPassphrase: String? = System.getenv("SIGN_KEY_PASSPHRASE")
 
     if (!signingKey.isNullOrBlank()) {
         extensions.configure<SigningExtension>("signing") {
-            useInMemoryPgpKeys(signingKeyId, signingKey, signingKeyPassphrase)
+            if (signingKeyId?.isNotBlank() == true) {
+                useInMemoryPgpKeys(signingKeyId, signingKey, signingKeyPassphrase)
+            } else {
+                useInMemoryPgpKeys(signingKey, signingKeyPassphrase)
+            }
             publications.forEach { publicationName ->
                 extensions.findByType(PublishingExtension::class)!!.publications.findByName(publicationName)?.let {
                     sign(it)
diff --git a/gradle.properties b/gradle.properties
index 28a34b9ea9..39027e4fd2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -12,5 +12,5 @@ language_version=1.4
 # Code style
 kotlin.code.style=official
 # Gradle settings
-org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=1g
+org.gradle.jvmargs=-Xmx8g -XX:MaxMetaspaceSize=2g
 org.gradle.parallel=true
diff --git a/runners/gradle-plugin/build.gradle.kts b/runners/gradle-plugin/build.gradle.kts
index d7f7e95b80..c69eaa3e07 100644
--- a/runners/gradle-plugin/build.gradle.kts
+++ b/runners/gradle-plugin/build.gradle.kts
@@ -44,6 +44,7 @@ gradlePlugin {
             description = "Dokka, the Kotlin documentation tool"
             implementationClass = "org.jetbrains.dokka.gradle.DokkaPlugin"
             version = dokkaVersion
+            isAutomatedPublishing = false // This will probably have to be fixed for Gradle Plugin Portal release
         }
     }
 }
@@ -61,10 +62,6 @@ pluginBundle {
 
 publishing {
     publications {
-        register<MavenPublication>("pluginMaven") {
-            artifactId = "dokka-gradle-plugin"
-        }
-
         register<MavenPublication>("dokkaGradlePluginForIntegrationTests") {
             artifactId = "dokka-gradle-plugin"
             from(components["java"])
@@ -77,8 +74,6 @@ tasks.withType<PublishToMavenRepository>().configureEach {
     onlyIf { publication != publishing.publications["dokkaGradlePluginForIntegrationTests"] }
 }
 
-configureSpacePublicationIfNecessary("dokkaGradlePluginPluginMarkerMaven", "pluginMaven")
-configureBintrayPublicationIfNecessary("dokkaGradlePluginPluginMarkerMaven", "pluginMaven")
-configureSonatypePublicationIfNecessary("dokkaGradlePluginPluginMarkerMaven", "pluginMaven")
-createDokkaPublishTaskIfNecessary()
-
+registerDokkaArtifactPublication("dokkaGradleMavenPlugin") {
+    artifactId = "dokka-gradle-plugin"
+}
diff --git a/runners/maven-plugin/src/main/kotlin/DokkaMojo.kt b/runners/maven-plugin/src/main/kotlin/DokkaMojo.kt
index 6ed433d049..e0eaf4851a 100644
--- a/runners/maven-plugin/src/main/kotlin/DokkaMojo.kt
+++ b/runners/maven-plugin/src/main/kotlin/DokkaMojo.kt
@@ -22,7 +22,6 @@ import org.jetbrains.dokka.*
 import org.jetbrains.dokka.DokkaConfiguration.ExternalDocumentationLink
 import java.io.File
 import java.net.URL
-import java.util.stream.Collectors
 
 class SourceLinkMapItem {
     @Parameter(name = "path", required = true)