diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 3643e5c0..4a8261dc 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -42,7 +42,8 @@ jobs:
         env:
           SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
           SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
-        run: ./gradlew publishToSonatype docs --no-daemon
+        # Edited below to add MaxMetaspace for dokka workaround
+        run: ./gradlew publishToSonatype docs --no-daemon -Dorg.gradle.jvmargs="-XX:MaxMetaspaceSize=350m"
       - name: Determine docs target repository
         uses: haya14busa/action-cond@v1
         id: docs_target
diff --git a/build.gradle b/build.gradle
index 06ccb346..b7ab69d2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,12 +4,19 @@ buildscript {
     }
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
-        classpath "org.jetbrains.dokka:dokka-gradle-plugin:${dokka_version}"
 
         classpath "io.micronaut.build.internal:micronaut-gradle-plugins:3.0.3"
     }
 }
 
+plugins {
+    id("org.jetbrains.dokka") version "${dokka_version}"
+}
+
+repositories {
+    jcenter() // or maven(url="https://dl.bintray.com/kotlin/dokka")
+}
+
 subprojects { Project subproject ->
     group "io.micronaut.kotlin"
 
@@ -21,7 +28,6 @@ subprojects { Project subproject ->
 
 apply plugin: "io.micronaut.build.internal.docs"
 apply plugin: "io.micronaut.build.internal.dependency-updates"
-apply plugin: 'org.jetbrains.dokka'
 
 tasks.named("dokkaHtmlMultiModule") {
     outputDirectory.set(new File("${rootProject.buildDir}/docs/api"))