diff --git a/build.gradle b/build.gradle
index e9a935e4..a1226c19 100644
--- a/build.gradle
+++ b/build.gradle
@@ -310,3 +310,7 @@ project.afterEvaluate {
     }
 }
 
+tasks.named("build").configure {
+    finalizedBy("groovydoc")
+}
+
diff --git a/settings.gradle b/settings.gradle
index 2b260509..72dfb3e4 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -6,7 +6,7 @@ plugins {
 gradleEnterprise {
     server = 'https://ge.grails.org'
     buildScan {
-        publishAlways()
+        publishAlwaysIf(System.getenv('CI') == 'true')
         publishIfAuthenticated()
         uploadInBackground = System.getenv("CI") == null
         capture {