diff --git a/README.md b/README.md
index 945ce79e..94124291 100644
--- a/README.md
+++ b/README.md
@@ -175,7 +175,7 @@ For Maven builds, the version of the Develocity Maven extension automatically ap
 
 | TC Build Scan plugin version | Injected Develocity Maven extension version | Injected Common CCUD Maven extension version |
 |------------------------------|---------------------------------------------|----------------------------------------------|
-| Next                         | 1.21.3                                      | 2.0                                          |
+| Next                         | 1.21.4                                      | 2.0                                          |
 | 0.35                         | 1.18.1                                      | 1.12.2                                       |
 | 0.34                         | 1.18                                        | 1.12.2                                       |
 | 0.33                         | 1.16.1                                      | 1.11.1                                       |
diff --git a/agent/build.gradle b/agent/build.gradle
index e97ecc74..787cb05b 100644
--- a/agent/build.gradle
+++ b/agent/build.gradle
@@ -16,7 +16,7 @@ configurations {
 
 dependencies {
     mvnExtensions project(path: ':agent:service-message-maven-extension', configuration: 'mvnExtension')
-    mvnExtensions 'com.gradle:develocity-maven-extension:1.21.3'
+    mvnExtensions 'com.gradle:develocity-maven-extension:1.21.4'
     mvnExtensions 'com.gradle:common-custom-user-data-maven-extension:2.0'
 
     testImplementation gradleTestKit()
diff --git a/agent/service-message-maven-extension/.mvn/extensions.xml b/agent/service-message-maven-extension/.mvn/extensions.xml
index 2e70b99e..7cf3cab8 100644
--- a/agent/service-message-maven-extension/.mvn/extensions.xml
+++ b/agent/service-message-maven-extension/.mvn/extensions.xml
@@ -3,7 +3,7 @@
     <extension>
         <groupId>com.gradle</groupId>
         <artifactId>develocity-maven-extension</artifactId>
-        <version>1.21.3</version>
+        <version>1.21.4</version>
     </extension>
     <extension>
         <groupId>com.gradle</groupId>
diff --git a/agent/service-message-maven-extension/pom.xml b/agent/service-message-maven-extension/pom.xml
index e6e6e6ac..255ee042 100644
--- a/agent/service-message-maven-extension/pom.xml
+++ b/agent/service-message-maven-extension/pom.xml
@@ -28,13 +28,13 @@
         <dependency>
             <groupId>com.gradle</groupId>
             <artifactId>gradle-enterprise-maven-extension</artifactId>
-            <version>1.21.3</version>
+            <version>1.21.4</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.gradle</groupId>
             <artifactId>develocity-maven-extension</artifactId>
-            <version>1.21.3</version>
+            <version>1.21.4</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/agent/src/main/java/nu/studer/teamcity/buildscan/agent/BuildScanServiceMessageInjector.java b/agent/src/main/java/nu/studer/teamcity/buildscan/agent/BuildScanServiceMessageInjector.java
index 6d860576..e0fc1f28 100644
--- a/agent/src/main/java/nu/studer/teamcity/buildscan/agent/BuildScanServiceMessageInjector.java
+++ b/agent/src/main/java/nu/studer/teamcity/buildscan/agent/BuildScanServiceMessageInjector.java
@@ -42,7 +42,7 @@ public class BuildScanServiceMessageInjector extends AgentLifeCycleAdapter {
     private static final String MAVEN_RUNNER = "Maven2";
     private static final String MAVEN_CMD_PARAMS = "runnerArgs";
     private static final String BUILD_SCAN_EXT_MAVEN = "service-message-maven-extension-1.0.jar";
-    private static final String DEVELOCITY_EXT_MAVEN = "develocity-maven-extension-1.21.3.jar";
+    private static final String DEVELOCITY_EXT_MAVEN = "develocity-maven-extension-1.21.4.jar";
     private static final String COMMON_CUSTOM_USER_DATA_EXT_MAVEN = "common-custom-user-data-maven-extension-2.0.jar";
 
     // TeamCity Command-line runner
diff --git a/agent/src/test/groovy/nu/studer/teamcity/buildscan/agent/maven/BaseExtensionApplicationTest.groovy b/agent/src/test/groovy/nu/studer/teamcity/buildscan/agent/maven/BaseExtensionApplicationTest.groovy
index 8b54a3ab..1b3d50bc 100644
--- a/agent/src/test/groovy/nu/studer/teamcity/buildscan/agent/maven/BaseExtensionApplicationTest.groovy
+++ b/agent/src/test/groovy/nu/studer/teamcity/buildscan/agent/maven/BaseExtensionApplicationTest.groovy
@@ -38,7 +38,7 @@ abstract class BaseExtensionApplicationTest extends Specification {
 
     static final String DEVELOCITY_URL_STR = System.getenv('DEVELOCITY_TEST_INSTANCE')
     static final URI DEVELOCITY_URL = DEVELOCITY_URL_STR ? new URI(DEVELOCITY_URL_STR) : null
-    static final String DEVELOCITY_EXTENSION_VERSION = '1.21.3'
+    static final String DEVELOCITY_EXTENSION_VERSION = '1.21.4'
     static final String CCUD_EXTENSION_VERSION = '2.0'
 
     @TempDir
diff --git a/src/main/resources/default-plugin-versions.properties b/src/main/resources/default-plugin-versions.properties
index ac39f897..929be15e 100644
--- a/src/main/resources/default-plugin-versions.properties
+++ b/src/main/resources/default-plugin-versions.properties
@@ -1,4 +1,4 @@
 gradleEnterprisePluginVersion=3.17.4
 commonCustomUserDataPluginVersion=2.0.1
-gradleEnterpriseExtensionVersion=1.21.3
+gradleEnterpriseExtensionVersion=1.21.4
 commonCustomUserDataExtensionVersion=2.0
diff --git a/src/test/groovy/nu/studer/teamcity/buildscan/connection/DevelocityConnectionProviderTest.groovy b/src/test/groovy/nu/studer/teamcity/buildscan/connection/DevelocityConnectionProviderTest.groovy
index c1ab8de1..98c1d44c 100644
--- a/src/test/groovy/nu/studer/teamcity/buildscan/connection/DevelocityConnectionProviderTest.groovy
+++ b/src/test/groovy/nu/studer/teamcity/buildscan/connection/DevelocityConnectionProviderTest.groovy
@@ -51,7 +51,7 @@ class DevelocityConnectionProviderTest extends Specification {
         ALLOW_UNTRUSTED_SERVER                  | 'true'                          | 'Allow Untrusted Server'
         DEVELOCITY_PLUGIN_VERSION               | '3.17.4'                        | 'Develocity Gradle Plugin Version'
         CCUD_PLUGIN_VERSION                     | '2.0.1'                         | 'Common Custom User Data Gradle Plugin Version'
-        DEVELOCITY_EXTENSION_VERSION            | '1.21.3'                        | 'Develocity Maven Extension Version'
+        DEVELOCITY_EXTENSION_VERSION            | '1.21.4'                        | 'Develocity Maven Extension Version'
         CCUD_EXTENSION_VERSION                  | '2.0'                           | 'Common Custom User Data Maven Extension Version'
         CUSTOM_DEVELOCITY_EXTENSION_COORDINATES | 'com.company:my-ge-extension'   | 'Develocity Maven Extension Custom Coordinates'
         CUSTOM_CCUD_EXTENSION_COORDINATES       | 'com.company:my-ccud-extension' | 'Common Custom User Data Maven Extension Custom Coordinates'