diff --git a/.gitignore b/.gitignore
index 673f29c88..b1a97744f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,7 @@
 .springBeans
 .settings/
 target/
-.mvn/.gradle-enterprise
+.mvn/.develocity
 
 #IntelliJ Stuff
 .idea
diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
index 2c7828bdd..1e3bb355f 100644
--- a/.mvn/extensions.xml
+++ b/.mvn/extensions.xml
@@ -1,13 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extensions>
 	<extension>
-		<groupId>com.gradle</groupId>
-		<artifactId>gradle-enterprise-maven-extension</artifactId>
-		<version>1.18.1</version>
-	</extension>
-	<extension>
-		<groupId>com.gradle</groupId>
-		<artifactId>common-custom-user-data-maven-extension</artifactId>
-		<version>1.12.3</version>
+		<groupId>io.spring.develocity.conventions</groupId>
+		<artifactId>develocity-conventions-maven-extension</artifactId>
+		<version>0.0.19</version>
 	</extension>
 </extensions>
diff --git a/.mvn/gradle-enterprise.xml b/.mvn/gradle-enterprise.xml
deleted file mode 100644
index bbe439e12..000000000
--- a/.mvn/gradle-enterprise.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<gradleEnterprise
-		xmlns="https://www.gradle.com/gradle-enterprise-maven" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xsi:schemaLocation="https://www.gradle.com/gradle-enterprise-maven https://www.gradle.com/schema/gradle-enterprise-maven.xsd">
-	<server>
-		<url>https://ge.spring.io</url>
-	</server>
-	<buildScan>
-		<backgroundBuildScanUpload>#{isFalse(env['CI'])}</backgroundBuildScanUpload>
-		<captureGoalInputFiles>true</captureGoalInputFiles>
-		<publishIfAuthenticated>true</publishIfAuthenticated>
-		<obfuscation>
-			<ipAddresses>#{{'0.0.0.0'}}</ipAddresses>
-		</obfuscation>
-	</buildScan>
-	<buildCache>
-		<local>
-			<enabled>true</enabled>
-		</local>
-		<remote>
-			<server>
-				<credentials>
-					<username>${env.GRADLE_ENTERPRISE_CACHE_USERNAME}</username>
-					<password>${env.GRADLE_ENTERPRISE_CACHE_PASSWORD}</password>
-				</credentials>
-			</server>
-			<enabled>true</enabled>
-			<storeEnabled>#{env['GRADLE_ENTERPRISE_CACHE_USERNAME'] != null and env['GRADLE_ENTERPRISE_CACHE_PASSWORD'] != null}</storeEnabled>
-		</remote>
-	</buildCache>
-</gradleEnterprise>
diff --git a/bom/pom.xml b/bom/pom.xml
index df1dd1273..507efd36c 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -55,9 +55,9 @@
 			<plugins>
 				<plugin>
 					<groupId>com.gradle</groupId>
-					<artifactId>gradle-enterprise-maven-extension</artifactId>
+					<artifactId>develocity-maven-extension</artifactId>
 					<configuration>
-						<gradleEnterprise>
+						<develocity>
 							<plugins>
 								<plugin>
 									<artifactId>maven-surefire-plugin</artifactId>
@@ -66,7 +66,7 @@
 									</outputs>
 								</plugin>
 							</plugins>
-						</gradleEnterprise>
+						</develocity>
 					</configuration>
 				</plugin>
 			</plugins>
diff --git a/pom.xml b/pom.xml
index 230032eeb..96c012dd0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -190,9 +190,9 @@
 			<plugins>
 				<plugin>
 					<groupId>com.gradle</groupId>
-					<artifactId>gradle-enterprise-maven-extension</artifactId>
+					<artifactId>develocity-maven-extension</artifactId>
 					<configuration>
-						<gradleEnterprise>
+						<develocity>
 							<plugins>
 								<plugin>
 									<artifactId>maven-surefire-plugin</artifactId>
@@ -201,7 +201,7 @@
 									</outputs>
 								</plugin>
 							</plugins>
-						</gradleEnterprise>
+						</develocity>
 					</configuration>
 				</plugin>
 			</plugins>