diff --git a/build.gradle b/build.gradle
index 9f62933c..dbec8cfa 100644
--- a/build.gradle
+++ b/build.gradle
@@ -24,13 +24,6 @@ allprojects {
 	}
 }
 
-if (hasProperty('buildScan')) {
-	buildScan {
-		termsOfServiceUrl = 'https://gradle.com/terms-of-service'
-		termsOfServiceAgree = 'yes'
-	}
-}
-
 nohttp {
 	allowlistFile = project.file('src/nohttp/allowlist.lines')
 	source.exclude "**/bin/**"
diff --git a/settings.gradle b/settings.gradle
index 75a495ce..2075459c 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -8,10 +8,14 @@ pluginManagement {
 }
 
 plugins {
-	id "com.gradle.enterprise" version "3.12.6"
-	id "io.spring.ge.conventions" version "0.0.13"
+	id 'com.gradle.develocity' version '3.17.2'
+	id 'io.spring.ge.conventions' version '0.0.17' apply false
 }
 
+startParameter.noBuildScan = startParameter.taskNames.contains('format')
+
+apply plugin: 'io.spring.ge.conventions'
+
 include 'spring-pulsar'
 include 'spring-pulsar-bom'
 include 'spring-pulsar-cache-provider'
@@ -35,9 +39,11 @@ rootProject.children.findAll { !it.name.startsWith('sample-') }
 		.each {project -> project.buildFileName = "${project.name}.gradle" }
 
 settings.gradle.projectsLoaded {
-	gradleEnterprise {
+	develocity {
 		buildScan {
-			publishOnFailure()
+			publishing.onlyIf { !it.buildResult.failures.empty }
+			termsOfUseUrl = 'https://gradle.com/terms-of-service'
+			termsOfUseAgree = 'yes'
 		}
 	}
 }