diff --git a/charts/hono/README.md b/charts/hono/README.md
index 7eef36c4..bbbf51af 100644
--- a/charts/hono/README.md
+++ b/charts/hono/README.md
@@ -105,6 +105,8 @@ The command removes all the Kubernetes components associated with the chart and
 
 * Use Hono 2.5.0 container images.
 * Update bitnami/kafka chart to version 26.8.x which uses Kafka 3.6 in Kraft mode.
+* Allow setting the `useLegacyTraceContextFormat` Hono client configuration value. Setting it to `false` will
+  enable usage of a more generic format for storing the OpenTelemetry trace context information in an AMQP 1.0 message.
 
 ### 2.5.6
 
diff --git a/charts/hono/templates/_helpers.tpl b/charts/hono/templates/_helpers.tpl
index 76d13556..ff2f769a 100644
--- a/charts/hono/templates/_helpers.tpl
+++ b/charts/hono/templates/_helpers.tpl
@@ -266,6 +266,7 @@ messaging:
   certPath: {{ .dot.Values.adapters.amqpMessagingNetworkSpec.certPath | quote }}
   trustStorePath: {{ .dot.Values.adapters.amqpMessagingNetworkSpec.trustStorePath | quote }}
   hostnameVerificationRequired: {{ .dot.Values.adapters.amqpMessagingNetworkSpec.hostnameVerificationRequired }}
+  useLegacyTraceContextFormat: {{ .dot.Values.adapters.amqpMessagingNetworkSpec.useLegacyTraceContextFormat }}
 {{- else }}
   {{- required ".Values.adapters.amqpMessagingNetworkSpec MUST be set if example AMQP Messaging Network is disabled" .dot.Values.adapters.amqpMessagingNetworkSpec | toYaml | nindent 2 }}
 {{- end }}
@@ -372,6 +373,7 @@ command:
   certPath: {{ .dot.Values.adapters.commandAndControlSpec.certPath | quote }}
   trustStorePath: {{ .dot.Values.adapters.commandAndControlSpec.trustStorePath | quote }}
   hostnameVerificationRequired: {{ .dot.Values.adapters.commandAndControlSpec.hostnameVerificationRequired }}
+  useLegacyTraceContextFormat: {{ .dot.Values.adapters.commandAndControlSpec.useLegacyTraceContextFormat }}
 {{- else }}
   {{- required ".Values.adapters.commandAndControlSpec MUST be set if example AMQP Messaging Network is disabled" .dot.Values.adapters.commandAndControlSpec | toYaml | nindent 2 }}
 {{- end -}}
diff --git a/charts/hono/templates/hono-service-command-router/hono-service-command-router-secret.yaml b/charts/hono/templates/hono-service-command-router/hono-service-command-router-secret.yaml
index 4dab06b2..bcfb3998 100644
--- a/charts/hono/templates/hono-service-command-router/hono-service-command-router-secret.yaml
+++ b/charts/hono/templates/hono-service-command-router/hono-service-command-router-secret.yaml
@@ -88,6 +88,7 @@ stringData:
         certPath: {{ .Values.adapters.commandAndControlSpec.certPath }}
         trustStorePath: {{ .Values.adapters.commandAndControlSpec.trustStorePath }}
         hostnameVerificationRequired: {{ .Values.adapters.commandAndControlSpec.hostnameVerificationRequired }}
+        useLegacyTraceContextFormat: {{ .Values.adapters.commandAndControlSpec.useLegacyTraceContextFormat }}
       {{- else }}
         {{- required ".Values.adapters.commandAndControlSpec MUST be set if example AMQP Messaging Network is disabled" .Values.adapters.commandAndControlSpec | toYaml | nindent 8 }}
       {{- end }}
diff --git a/charts/hono/values.yaml b/charts/hono/values.yaml
index 50150b4e..ca40acba 100755
--- a/charts/hono/values.yaml
+++ b/charts/hono/values.yaml
@@ -134,12 +134,14 @@ adapters:
   # Please refer to https://www.eclipse.org/hono/docs/admin-guide/hono-client-configuration/
   # for a description of supported properties.
   # However, if "amqpMessagingNetworkExample.enabled" is set to true, only
-  # "keyPath", "certPath", "trustStorePath", "hostnameVerificationRequired" can be set.
+  # "keyPath", "certPath", "trustStorePath", "hostnameVerificationRequired", "useLegacyTraceContextFormat"
+  # can be set.
   amqpMessagingNetworkSpec:
     keyPath: "/opt/hono/tls/tls.key"
     certPath: "/opt/hono/tls/tls.crt"
     trustStorePath: "/opt/hono/tls/ca.crt"
     hostnameVerificationRequired: false
+    useLegacyTraceContextFormat: true
   #  host: "my-amqp-host"
   #  port: 5671
   #  credentialsPath: "/etc/conf/amqp-credentials.properties"
@@ -152,12 +154,14 @@ adapters:
   # Please refer to https://www.eclipse.org/hono/docs/admin-guide/hono-client-configuration/
   # for a description of supported properties.
   # However, if "amqpMessagingNetworkExample.enabled" is set to true, only
-  # "keyPath", "certPath", "trustStorePath", "hostnameVerificationRequired" can be set.
+  # "keyPath", "certPath", "trustStorePath", "hostnameVerificationRequired", "useLegacyTraceContextFormat"
+  # can be set.
   commandAndControlSpec:
     keyPath: "/opt/hono/tls/tls.key"
     certPath: "/opt/hono/tls/tls.crt"
     trustStorePath: "/opt/hono/tls/ca.crt"
     hostnameVerificationRequired: false
+    useLegacyTraceContextFormat: true
 
   # kafkaMessagingSpec contains the configuration used by all protocol
   # adapters for connecting to the Kafka cluster to be used for messaging.