diff --git a/.gitignore b/.gitignore
index 0bebe6bad6e..0b5b93e04a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 .mvn/.gradle-enterprise/
+.mvn/.develocity/
 .scannerwork/
 .vscode
 *.iml
diff --git a/.mvn/gradle-enterprise.xml b/.mvn/develocity.xml
similarity index 65%
rename from .mvn/gradle-enterprise.xml
rename to .mvn/develocity.xml
index c9c4523b97b..aa42977aa2e 100644
--- a/.mvn/gradle-enterprise.xml
+++ b/.mvn/develocity.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 
-<!-- Common gradle-enterprise.xml configuration for Maven shared between CI agents and developers building locally.
+<!-- Common develocity.xml configuration for Maven shared between CI agents and developers building locally.
 
      The build cache credentials required for CI builds to write to the remote build cache are read from environment variables.
      Possibly, the credentials are configured in Jenkins via Credentials plugin (https://plugins.jenkins.io/credentials/) and
@@ -9,24 +9,24 @@
 
      Note: In the XML configuration below, you need to adjust
 
-             - the server url of your Gradle Enterprise server
+             - the server url of your Develocity server
              - the name of the environment variable that reveals the build is running in a CI environment
              - the names of the environment variables holding the build cache credentials
 
            to the specifics of your CI server settings. -->
 
-<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">
+<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.openapi-generator.tech/</url> <!-- adjust to your GE server -->
-    <allowUntrusted>false</allowUntrusted> <!-- ensure a trusted certificate is configured -->
+    <url>https://ge.openapi-generator.tech/</url>
+    <allowUntrusted>false</allowUntrusted>
   </server>
   <buildScan>
-    <captureGoalInputFiles>true</captureGoalInputFiles>
     <backgroundBuildScanUpload>#{isFalse(env['CI'])}</backgroundBuildScanUpload> <!-- adjust to your CI provider -->
-    <publish>ALWAYS</publish>
-    <publishIfAuthenticated>true</publishIfAuthenticated>
+    <publishing>
+      <onlyIf>authenticated</onlyIf>
+    </publishing>
     <obfuscation>
       <!-- Use a redacted value.-->
       <ipAddresses>#{{'0.0.0.0'}}</ipAddresses>
@@ -42,4 +42,4 @@
       <storeEnabled>#{isTrue(env['CI']) and isTrue(env['GRADLE_ENTERPRISE_ACCESS_KEY'])}</storeEnabled>
     </remote>
   </buildCache>
-</gradleEnterprise>
+</develocity>
diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
index e0cc4d633f5..1ac0c48ac38 100644
--- a/.mvn/extensions.xml
+++ b/.mvn/extensions.xml
@@ -2,12 +2,12 @@
 <extensions>
     <extension>
         <groupId>com.gradle</groupId>
-        <artifactId>gradle-enterprise-maven-extension</artifactId>
-        <version>1.20.1</version>
+        <artifactId>develocity-maven-extension</artifactId>
+        <version>1.21.6</version>
     </extension>
     <extension>
         <groupId>com.gradle</groupId>
         <artifactId>common-custom-user-data-maven-extension</artifactId>
-        <version>1.12.5</version>
+        <version>2.0</version>
     </extension>
 </extensions>
diff --git a/pom.xml b/pom.xml
index 58fdd4c16fd..14a738c520b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -414,9 +414,9 @@
                 </plugin>
                 <plugin>
                     <groupId>com.gradle</groupId>
-                    <artifactId>gradle-enterprise-maven-extension</artifactId>
+                    <artifactId>develocity-maven-extension</artifactId>
                     <configuration>
-                        <gradleEnterprise>
+                        <develocity>
                             <normalization>
                                 <runtimeClassPath>
                                     <ignoredFiles>
@@ -424,7 +424,7 @@
                                     </ignoredFiles>
                                 </runtimeClassPath>
                             </normalization>
-                        </gradleEnterprise>
+                        </develocity>
                     </configuration>
                 </plugin>
             </plugins>
diff --git a/website/src/dynamic/users.yml b/website/src/dynamic/users.yml
index c2cacb84f8b..2064598567e 100755
--- a/website/src/dynamic/users.yml
+++ b/website/src/dynamic/users.yml
@@ -173,6 +173,11 @@
   image: "img/companies/deeproute_logo.jpg"
   infoLink: "https://www.deeproute.ai/"
   pinned: false
+-
+  caption: Develocity
+  image: "img/companies/develocity.png"
+  infoLink: "https://gradle.com/"
+  pinned: false
 -
   caption: "dmTECH GmbH"
   image: "img/companies/dmtech.jpeg"
@@ -268,11 +273,6 @@
   image: "img/companies/godaddy.png"
   infoLink: "https://www.godaddy.com/"
   pinned: false
--
-  caption: Gradle Enterprise
-  image: "img/companies/gradle-enterprise.png"
-  infoLink: "https://gradle.com/"
-  pinned: false
 -
   caption: "Gumtree"
   image: "img/companies/gumtree.png"
diff --git a/website/static/img/companies/develocity.png b/website/static/img/companies/develocity.png
new file mode 100644
index 00000000000..01d2dee68e9
Binary files /dev/null and b/website/static/img/companies/develocity.png differ