diff --git a/.github/workflows/PR.yml b/.github/workflows/PR.yml
index 0e410f0284c..76a29a24b88 100644
--- a/.github/workflows/PR.yml
+++ b/.github/workflows/PR.yml
@@ -45,7 +45,7 @@ jobs:
           ./gradlew build -x :sqldelight-idea-plugin:build -x :sqldelight-gradle-plugin:test --stacktrace
       - name: Run gradle plugin tests
         if: matrix.os == 'ubuntu-18.04' && matrix.job == 'gradle-plugin-tests'
-        run: ./gradlew :sqldelight-gradle-plugin:test
+        run: ./gradlew :sqldelight-gradle-plugin:test --stacktrace
 
       - name: Run the IntelliJ plugin
         if: matrix.os == 'ubuntu-18.04' && matrix.job == 'instrumentation'
diff --git a/build.gradle b/build.gradle
index 7ab6853c29b..05b725550be 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,10 +5,16 @@ buildscript {
         strictly '4.4.1'
       }
     }
+    classpath("org.jetbrains.dokka:dokka-gradle-plugin") {
+      version {
+        strictly deps.versions.dokka.get()
+      }
+    }
   }
 }
 
 plugins {
+  alias(deps.plugins.dokka) apply false
   alias(deps.plugins.grammarKitComposer) apply false
   alias(deps.plugins.kotlin.multiplatform) apply false
   alias(deps.plugins.kotlin.jvm) apply false
@@ -18,7 +24,6 @@ plugins {
   alias(deps.plugins.android.application) apply false
   alias(deps.plugins.android.library) apply false
   alias(deps.plugins.publish) apply false
-  alias(deps.plugins.dokka) apply false
   alias(deps.plugins.spotless)
 }
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index f2168ca1946..0c74c359120 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 kotlin = "1.6.21"
-dokka = "1.6.10"
+dokka = "1.6.21"
 kotlinCoroutines = "1.6.1"
 idea = "211.7628.21" # Android Studio Bumblebee (see https://plugins.jetbrains.com/docs/intellij/android-studio-releases-list.html)
 androidxSqlite = "2.2.0"