diff --git a/settings.gradle b/settings.gradle
index 9db07a453c4..bbca0b514b7 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'com.gradle.enterprise' version '3.13.1'
+    id 'com.gradle.develocity' version '3.18.1'
     id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
 }
 
@@ -466,14 +466,14 @@ buildCache {
     }
 }
 
-def isCiServer = System.getenv('CI') == 'true'
-if (isCiServer) {
-    gradleEnterprise {
-        buildScan {
-            termsOfServiceUrl = 'https://gradle.com/terms-of-service'
-            termsOfServiceAgree = 'yes'
+develocity {
+    buildScan {
+        // buildScan will still publish when gradlew is explicitly invoked with `--scan`
+        publishing.onlyIf { false }
+        termsOfUseUrl = 'https://gradle.com/help/legal-terms-of-use'
+        termsOfUseAgree = 'yes'
+        if(System.getenv('CI') == 'true') {
             tag('CI')
         }
     }
 }
-