diff --git a/.gitignore b/.gitignore
index fc4ed6e86..365f5b205 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,5 +24,4 @@ _site
 
 credentials.yml
 .flattened-pom.xml
-.mvn/.gradle-enterprise
 .mvn/.develocity
diff --git a/.mvn/develocity.xml b/.mvn/develocity.xml
deleted file mode 100644
index b54815e75..000000000
--- a/.mvn/develocity.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<develocity
-		xmlns="https://www.gradle.com/develocity-maven" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xsi:schemaLocation="https://www.gradle.com/develocity-maven https://www.gradle.com/schema/develocity-maven.xsd">
-	<server>
-		<url>https://ge.spring.io</url>
-	</server>
-	<buildScan>
-		<backgroundBuildScanUpload>false</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>
-</develocity>
\ No newline at end of file
diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
index 854714cee..a36ba0531 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>develocity-maven-extension</artifactId>
-		<version>1.21.3</version>
-	</extension>
-	<extension>
-		<groupId>com.gradle</groupId>
-		<artifactId>common-custom-user-data-maven-extension</artifactId>
-		<version>2.0</version>
+		<groupId>io.spring.develocity.conventions</groupId>
+		<artifactId>develocity-conventions-maven-extension</artifactId>
+		<version>0.0.19</version>
 	</extension>
 </extensions>
\ No newline at end of file
diff --git a/Jenkinsfile b/Jenkinsfile
index f479045e6..bc34f8b63 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -37,8 +37,7 @@ pipeline {
 			options { timeout(time: 30, unit: 'MINUTES')}
 			environment {
 				ARTIFACTORY = credentials("${p['artifactory.credentials']}")
-				GRADLE_ENTERPRISE_CACHE = credentials("${p['gradle-enterprise-cache.credentials']}")
-				GRADLE_ENTERPRISE_ACCESS_KEY = credentials("${p['gradle-enterprise.access-key']}")
+				DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
 			}
 			steps {
 				script {
@@ -63,8 +62,7 @@ pipeline {
 					options { timeout(time: 30, unit: 'MINUTES')}
 					environment {
 						ARTIFACTORY = credentials("${p['artifactory.credentials']}")
-						GRADLE_ENTERPRISE_CACHE = credentials("${p['gradle-enterprise-cache.credentials']}")
-						GRADLE_ENTERPRISE_ACCESS_KEY = credentials("${p['gradle-enterprise.access-key']}")
+						DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
 					}
 					steps {
 						script {
@@ -82,8 +80,7 @@ pipeline {
 					options { timeout(time: 30, unit: 'MINUTES')}
 					environment {
 						ARTIFACTORY = credentials("${p['artifactory.credentials']}")
-						GRADLE_ENTERPRISE_CACHE = credentials("${p['gradle-enterprise-cache.credentials']}")
-						GRADLE_ENTERPRISE_ACCESS_KEY = credentials("${p['gradle-enterprise.access-key']}")
+						DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
 					}
 					steps {
 						script {
@@ -101,8 +98,7 @@ pipeline {
 					options { timeout(time: 30, unit: 'MINUTES')}
 					environment {
 						ARTIFACTORY = credentials("${p['artifactory.credentials']}")
-						GRADLE_ENTERPRISE_CACHE = credentials("${p['gradle-enterprise-cache.credentials']}")
-						GRADLE_ENTERPRISE_ACCESS_KEY = credentials("${p['gradle-enterprise.access-key']}")
+						DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
 					}
 					steps {
 						script {
@@ -120,8 +116,7 @@ pipeline {
 					options { timeout(time: 30, unit: 'MINUTES')}
 					environment {
 						ARTIFACTORY = credentials("${p['artifactory.credentials']}")
-						GRADLE_ENTERPRISE_CACHE = credentials("${p['gradle-enterprise-cache.credentials']}")
-						GRADLE_ENTERPRISE_ACCESS_KEY = credentials("${p['gradle-enterprise.access-key']}")
+						DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
 					}
 					steps {
 						script {
@@ -137,8 +132,7 @@ pipeline {
 					options { timeout(time: 30, unit: 'MINUTES')}
 					environment {
 						ARTIFACTORY = credentials("${p['artifactory.credentials']}")
-						GRADLE_ENTERPRISE_CACHE = credentials("${p['gradle-enterprise-cache.credentials']}")
-						GRADLE_ENTERPRISE_ACCESS_KEY = credentials("${p['gradle-enterprise.access-key']}")
+						DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
 					}
 					steps {
 						script {
@@ -161,8 +155,7 @@ pipeline {
 				KEYRING = credentials('spring-signing-secring.gpg')
 				PASSPHRASE = credentials('spring-gpg-passphrase')
 				STAGING_PROFILE_ID = credentials('spring-data-release-deployment-maven-central-staging-profile-id')
-				GRADLE_ENTERPRISE_CACHE = credentials("${p['gradle-enterprise-cache.credentials']}")
-				GRADLE_ENTERPRISE_ACCESS_KEY = credentials("${p['gradle-enterprise.access-key']}")
+				DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
 			}
 
 			steps {
@@ -234,8 +227,7 @@ pipeline {
 				KEYRING = credentials('spring-signing-secring.gpg')
 				PASSPHRASE = credentials('spring-gpg-passphrase')
 				STAGING_PROFILE_ID = credentials('spring-data-release-deployment-maven-central-staging-profile-id')
-				GRADLE_ENTERPRISE_CACHE = credentials("${p['gradle-enterprise-cache.credentials']}")
-				GRADLE_ENTERPRISE_ACCESS_KEY = credentials("${p['gradle-enterprise.access-key']}")
+				DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
 			}
 
 			steps {
@@ -294,8 +286,7 @@ pipeline {
 
 			environment {
 				ARTIFACTORY = credentials("${p['artifactory.credentials']}")
-				GRADLE_ENTERPRISE_CACHE = credentials("${p['gradle-enterprise-cache.credentials']}")
-				GRADLE_ENTERPRISE_ACCESS_KEY = credentials("${p['gradle-enterprise.access-key']}")
+				DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
 			}
 
 			steps {
@@ -303,8 +294,6 @@ pipeline {
 				    docker.withRegistry('', "${p['dockerhub.credentials']}") {
 					    docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
                             sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ' +
-                                    'GRADLE_ENTERPRISE_CACHE_USERNAME=${GRADLE_ENTERPRISE_CACHE_USR} ' +
-                                    'GRADLE_ENTERPRISE_CACHE_PASSWORD=${GRADLE_ENTERPRISE_CACHE_PSW} ' +
                                     './mvnw -s settings.xml -Pjakarta-ee-10,distribute,docs ' +
                                     '-Dartifactory.server=https://repo.spring.io ' +
                                     "-Dartifactory.username=${ARTIFACTORY_USR} " +
diff --git a/ci/build-and-deploy-to-artifactory.sh b/ci/build-and-deploy-to-artifactory.sh
index 5960f8b46..e8e5eb91b 100755
--- a/ci/build-and-deploy-to-artifactory.sh
+++ b/ci/build-and-deploy-to-artifactory.sh
@@ -4,9 +4,6 @@ set -euo pipefail
 
 RELEASE_TYPE=$1
 
-export GRADLE_ENTERPRISE_CACHE_USERNAME=${GRADLE_ENTERPRISE_CACHE_USR}
-export GRADLE_ENTERPRISE_CACHE_PASSWORD=${GRADLE_ENTERPRISE_CACHE_PSW}
-
 echo 'Deploying to Artifactory...'
 
 MAVEN_OPTS="-Duser.name=spring-builds+jenkins -Duser.home=/tmp/jenkins-home" ./mvnw \
diff --git a/ci/build-and-deploy-to-maven-central.sh b/ci/build-and-deploy-to-maven-central.sh
index 9eb2a5730..5a48d3762 100755
--- a/ci/build-and-deploy-to-maven-central.sh
+++ b/ci/build-and-deploy-to-maven-central.sh
@@ -5,9 +5,6 @@ set -euo pipefail
 PROJECT_VERSION=$1
 STAGING_REPOSITORY_ID=$2
 
-export GRADLE_ENTERPRISE_CACHE_USERNAME=${GRADLE_ENTERPRISE_CACHE_USR}
-export GRADLE_ENTERPRISE_CACHE_PASSWORD=${GRADLE_ENTERPRISE_CACHE_PSW}
-
 echo 'Staging on Maven Central...'
 
 GNUPGHOME=/tmp/gpghome
diff --git a/ci/pipeline.properties b/ci/pipeline.properties
index 2aea08744..09915555f 100644
--- a/ci/pipeline.properties
+++ b/ci/pipeline.properties
@@ -18,5 +18,4 @@ docker.java.inside.basic=-v $HOME:/tmp/jenkins-home
 # Credentials
 artifactory.credentials=02bd1690-b54f-4c9f-819d-a77cb7a9822c
 dockerhub.credentials=hub.docker.com-springbuildmaster
-gradle-enterprise-cache.credentials=gradle_enterprise_cache_user
-gradle-enterprise.access-key=gradle_enterprise_secret_access_key
+develocity.access-key=gradle_enterprise_secret_access_key
diff --git a/ci/test.sh b/ci/test.sh
index ba458fba6..5ec6309d8 100755
--- a/ci/test.sh
+++ b/ci/test.sh
@@ -2,9 +2,6 @@
 
 set -euo pipefail
 
-export GRADLE_ENTERPRISE_CACHE_USERNAME=${GRADLE_ENTERPRISE_CACHE_USR}
-export GRADLE_ENTERPRISE_CACHE_PASSWORD=${GRADLE_ENTERPRISE_CACHE_PSW}
-
 MAVEN_OPTS="-Duser.name=spring-builds+jenkins -Duser.home=/tmp/jenkins-home" \
   ./mvnw -s settings.xml \
   -P${PROFILE} clean dependency:list test -Dsort -B -U
diff --git a/settings.xml b/settings.xml
index 28f0d1339..b474fd4ff 100644
--- a/settings.xml
+++ b/settings.xml
@@ -24,11 +24,6 @@
 			<username>${env.ARTIFACTORY_USR}</username>
 			<password>${env.ARTIFACTORY_PSW}</password>
 		</server>
-		<server>
-			<id>ge.spring.io</id>
-			<username>${env.GRADLE_ENTERPRISE_CACHE_USERNAME}</username>
-			<password>${env.GRADLE_ENTERPRISE_CACHE_PASSWORD}</password>
-		</server>
 	</servers>
 
 </settings>
\ No newline at end of file