diff --git a/pom.xml b/pom.xml
index c2f9482b7..142546e56 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
     <maven.compiler.source>${java.version}</maven.compiler.source>
     <maven.compiler.target>${java.version}</maven.compiler.target>
 
-    <zeebe.version>8.5.5</zeebe.version>
+    <zeebe.version>8.5.6</zeebe.version>
     <identity.version>8.5.4</identity.version>
 
     <spring-boot.version>3.2.5</spring-boot.version>
diff --git a/spring-boot-starter-camunda/src/main/java/io/camunda/zeebe/spring/client/configuration/ZeebeClientConfiguration.java b/spring-boot-starter-camunda/src/main/java/io/camunda/zeebe/spring/client/configuration/ZeebeClientConfiguration.java
index 1979d44bb..6acf874cc 100644
--- a/spring-boot-starter-camunda/src/main/java/io/camunda/zeebe/spring/client/configuration/ZeebeClientConfiguration.java
+++ b/spring-boot-starter-camunda/src/main/java/io/camunda/zeebe/spring/client/configuration/ZeebeClientConfiguration.java
@@ -350,6 +350,15 @@ public int getMaxMessageSize() {
         configCache);
   }
 
+  public int getMaxMetadataSize() {
+    return getOrLegacyOrDefault(
+        "MaxMetadataSize",
+        () -> camundaClientProperties.getZeebe().getMaxMetadataSize(),
+        null,
+        DEFAULT.getMaxMetadataSize(),
+        configCache);
+  }
+
   @Override
   public ScheduledExecutorService jobWorkerExecutor() {
     return zeebeClientExecutorService.get();
diff --git a/spring-boot-starter-camunda/src/main/java/io/camunda/zeebe/spring/client/properties/common/ZeebeClientProperties.java b/spring-boot-starter-camunda/src/main/java/io/camunda/zeebe/spring/client/properties/common/ZeebeClientProperties.java
index 52e6ec089..5f36307c1 100644
--- a/spring-boot-starter-camunda/src/main/java/io/camunda/zeebe/spring/client/properties/common/ZeebeClientProperties.java
+++ b/spring-boot-starter-camunda/src/main/java/io/camunda/zeebe/spring/client/properties/common/ZeebeClientProperties.java
@@ -10,6 +10,7 @@ public class ZeebeClientProperties extends ApiProperties {
   private Integer executionThreads;
   private Duration messageTimeToLive;
   private Integer maxMessageSize;
+  private Integer maxMetadataSize;
   private Duration requestTimeout;
   private String caCertificatePath;
   private Duration keepAlive;
@@ -106,4 +107,12 @@ public boolean isPreferRestOverGrpc() {
   public void setPreferRestOverGrpc(boolean preferRestOverGrpc) {
     this.preferRestOverGrpc = preferRestOverGrpc;
   }
+
+  public Integer getMaxMetadataSize() {
+    return maxMetadataSize;
+  }
+
+  public void setMaxMetadataSize(Integer maxMetadataSize) {
+    this.maxMetadataSize = maxMetadataSize;
+  }
 }