diff --git a/commons/ihe/hl7v2/pom.xml b/commons/ihe/hl7v2/pom.xml
index 336d374d64..04acfaf68b 100644
--- a/commons/ihe/hl7v2/pom.xml
+++ b/commons/ihe/hl7v2/pom.xml
@@ -58,10 +58,15 @@
             <optional>true</optional>
         </dependency>
         <dependency>
-            <groupId>io.zipkin.brave</groupId>
-            <artifactId>brave</artifactId>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-tracing</artifactId>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-tracing-bridge-brave</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-handler</artifactId>
diff --git a/commons/ihe/hl7v2/src/main/groovy/org/openehealth/ipf/commons/ihe/hl7v2/tracing/Handler.groovy b/commons/ihe/hl7v2/src/main/groovy/org/openehealth/ipf/commons/ihe/hl7v2/tracing/Handler.groovy
index 513d4e84f4..944b655b24 100644
--- a/commons/ihe/hl7v2/src/main/groovy/org/openehealth/ipf/commons/ihe/hl7v2/tracing/Handler.groovy
+++ b/commons/ihe/hl7v2/src/main/groovy/org/openehealth/ipf/commons/ihe/hl7v2/tracing/Handler.groovy
@@ -16,8 +16,8 @@
 
 package org.openehealth.ipf.commons.ihe.hl7v2.tracing
 
-import brave.SpanCustomizer
 import ca.uhn.hl7v2.model.Message
+import io.micrometer.tracing.SpanCustomizer
 
 /**
  * @author Christian Ohr
diff --git a/commons/ihe/hl7v2/src/main/groovy/org/openehealth/ipf/commons/ihe/hl7v2/tracing/Hl7MessageGetter.groovy b/commons/ihe/hl7v2/src/main/groovy/org/openehealth/ipf/commons/ihe/hl7v2/tracing/Hl7MessageGetter.groovy
index 6e288591c6..9ed53146b8 100644
--- a/commons/ihe/hl7v2/src/main/groovy/org/openehealth/ipf/commons/ihe/hl7v2/tracing/Hl7MessageGetter.groovy
+++ b/commons/ihe/hl7v2/src/main/groovy/org/openehealth/ipf/commons/ihe/hl7v2/tracing/Hl7MessageGetter.groovy
@@ -16,8 +16,9 @@
 
 package org.openehealth.ipf.commons.ihe.hl7v2.tracing
 
-import brave.propagation.Propagation
+
 import ca.uhn.hl7v2.model.AbstractMessage
+import io.micrometer.tracing.propagation.Propagator
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 
@@ -26,7 +27,7 @@ import org.slf4j.LoggerFactory
  *
  * @author Christian Ohr
  */
-class Hl7MessageGetter implements Propagation.Getter<AbstractMessage, String> {
+class Hl7MessageGetter implements Propagator.Getter<AbstractMessage> {
 
     private static final Logger LOG = LoggerFactory.getLogger(Hl7MessageGetter)
     private final String segmentName
diff --git a/commons/ihe/hl7v2/src/main/groovy/org/openehealth/ipf/commons/ihe/hl7v2/tracing/Hl7MessageSetter.groovy b/commons/ihe/hl7v2/src/main/groovy/org/openehealth/ipf/commons/ihe/hl7v2/tracing/Hl7MessageSetter.groovy
index 644d924403..ae7ada6bcf 100644
--- a/commons/ihe/hl7v2/src/main/groovy/org/openehealth/ipf/commons/ihe/hl7v2/tracing/Hl7MessageSetter.groovy
+++ b/commons/ihe/hl7v2/src/main/groovy/org/openehealth/ipf/commons/ihe/hl7v2/tracing/Hl7MessageSetter.groovy
@@ -16,9 +16,10 @@
 
 package org.openehealth.ipf.commons.ihe.hl7v2.tracing
 
-import brave.propagation.Propagation
+
 import ca.uhn.hl7v2.model.Composite
 import ca.uhn.hl7v2.model.Message
+import io.micrometer.tracing.propagation.Propagator
 import org.openehealth.ipf.modules.hl7.dsl.Repeatable
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
@@ -28,7 +29,7 @@ import org.slf4j.LoggerFactory
  *
  * @author Christian Ohr
  */
-class Hl7MessageSetter implements Propagation.Setter<Message, String> {
+class Hl7MessageSetter implements Propagator.Setter<Message> {
 
     private static final Logger LOG = LoggerFactory.getLogger(Hl7MessageSetter)
 
@@ -43,12 +44,13 @@ class Hl7MessageSetter implements Propagation.Setter<Message, String> {
     }
 
     @Override
-    void put(Message msg, String key, String value) {
+    void set(Message msg, String key, String value) {
         if (msg && key) {
             def qip = Composite.QIP(msg) //, [segmentFieldName: key, values: value ?: ''])
             qip[1] = key
             qip[2] = value ?: ''
-            def varies = nextRepetition(msg.get(segmentName)[1])
+            def seg = msg.get(segmentName)
+            def varies = nextRepetition(seg[1])
             varies.data = qip
 
             if (LOG.isDebugEnabled()) {
diff --git a/commons/ihe/hl7v2/src/main/groovy/org/openehealth/ipf/commons/ihe/hl7v2/tracing/MessageTracer.groovy b/commons/ihe/hl7v2/src/main/groovy/org/openehealth/ipf/commons/ihe/hl7v2/tracing/MessageTracer.groovy
index 92b639790c..6dd15c762e 100644
--- a/commons/ihe/hl7v2/src/main/groovy/org/openehealth/ipf/commons/ihe/hl7v2/tracing/MessageTracer.groovy
+++ b/commons/ihe/hl7v2/src/main/groovy/org/openehealth/ipf/commons/ihe/hl7v2/tracing/MessageTracer.groovy
@@ -16,15 +16,12 @@
 
 package org.openehealth.ipf.commons.ihe.hl7v2.tracing
 
-import brave.Span
-import brave.Tracer
-import brave.Tracing
-import brave.propagation.Propagation
 import ca.uhn.hl7v2.HL7Exception
 import ca.uhn.hl7v2.model.AbstractMessage
 import ca.uhn.hl7v2.model.Message
-import org.slf4j.Logger
-import org.slf4j.LoggerFactory
+import io.micrometer.tracing.Span
+import io.micrometer.tracing.Tracer
+import io.micrometer.tracing.propagation.Propagator
 
 /**
  * Helper class that injects and extracts tracing information from HL7 messages
@@ -34,66 +31,55 @@ import org.slf4j.LoggerFactory
  */
 class MessageTracer {
 
-    private static final Logger LOG = LoggerFactory.getLogger(MessageTracer.class)
-
     private static final String HL7_SENDING_APPLICATION = "MSH-3"
     private static final String HL7_SENDING_FACILITY = "MSH-4"
     private static final String HL7_MESSAGE_TYPE = "MSH-9-1"
     private static final String HL7_TRIGGER_EVENT = "MSH-9-2"
     private static final String HL7_PROCESSING_ID = "MSH-11"
 
-    private final Tracing tracing
+    private final Tracer tracer
     private final boolean removeSegment
     private final String segmentName
-    private final Propagation.Setter<Message, String> setter
-    private final Propagation.Getter<Message, String> getter
+    private final Propagator propagator;
+    private final Propagator.Setter<Message> setter
+    private final Propagator.Getter<Message> getter
 
     /**
-     * @param tracing Tracing instance
+     * @param tracer Tracer instance, e.g. BraveTracer
+     * @param propagator Propagator instance, e.g. BravePropagator
      * @param segmentName name of the segment with the propagated tracing information (default: ZTR)
      * @param removeSegment whether the segment with the propagated tracing information is removed (default: true)
      */
-    MessageTracer(Tracing tracing, String segmentName = 'ZTR', boolean removeSegment = true) {
-        this.tracing = tracing
+    MessageTracer(Tracer tracer, Propagator propagator, String segmentName = 'ZTR', boolean removeSegment = true) {
+        this.tracer = tracer
         this.removeSegment = removeSegment
         this.segmentName = segmentName
         this.setter = new Hl7MessageSetter(segmentName)
         this.getter = new Hl7MessageGetter(segmentName)
+        this.propagator = propagator;
     }
 
     void sendMessage(Message msg, String name, Handler sender) {
-        Tracer tracer = tracing.tracer()
-        Span span = startSpan(tracer.nextSpan(), Span.Kind.CLIENT, name, msg)
+        def span = startSpan(tracer.spanBuilder(), Span.Kind.CLIENT, name, msg)
         msg.addNonstandardSegment(segmentName)
-        tracing.propagation()
-                .injector(setter)
-                .inject(span.context(), msg)
-        Tracer.SpanInScope ws = tracer.withSpanInScope(span)
-        try {
+        try (def ws = this.tracer.withSpan(span)) {
+            propagator.inject(span.context(), msg, setter)
             sender.accept(msg, span)
         } catch (Throwable t) {
             span.error(t)
             throw t
         } finally {
-            ws?.close()
-            span?.finish()
+            span.end()
         }
     }
 
     void receiveMessage(Message msg, String name, Handler receiver) {
-        Tracer tracer = tracing.tracer()
-        Span span = startSpan(tracer.nextSpan(
-                tracing.propagation()
-                        .extractor(getter)
-                        .extract(msg)),
-                Span.Kind.SERVER, name, msg)
-        Tracer.SpanInScope ws = tracer.withSpanInScope(span)
-        try {
+        def span = startSpan(propagator.extract(msg, getter), Span.Kind.SERVER, name, msg)
+        try (def ws = tracer.withSpan(span)) {
             if (removeSegment && msg instanceof AbstractMessage) {
                 try {
                     msg.removeRepetition(segmentName, 0)
                 } catch (HL7Exception ignored) {
-                    // TODO LOG something?
                 }
             }
             receiver.accept(msg, span)
@@ -101,21 +87,20 @@ class MessageTracer {
             span.error(t)
             throw t
         } finally {
-            ws?.close()
-            span?.finish()
+            span.end()
         }
     }
 
-    private static Span startSpan(Span span, Span.Kind kind, String name, Message msg) {
-        span.kind(kind)
-                .name(name)
-                .tag(HL7_SENDING_APPLICATION, msg.MSH[3]?.value ?: '')
-                .tag(HL7_SENDING_FACILITY, msg.MSH[4]?.value ?: '')
-                .tag(HL7_MESSAGE_TYPE, msg.MSH[9][1]?.value ?: '')
-                .tag(HL7_TRIGGER_EVENT, msg.MSH[9][2]?.value ?: '')
-                .tag(HL7_PROCESSING_ID, msg.MSH[11]?.value ?: '')
-        // ExtraFieldPropagation.set(span.context(), 'messageId', msg.MSH[11]?.value ?: '')
-        span.start()
+    private static Span startSpan(Span.Builder spanBuilder, Span.Kind kind, String name, Message msg) {
+        spanBuilder
+            .name(name)
+            .kind(kind)
+            .tag(HL7_SENDING_APPLICATION, msg.MSH[3]?.value ?: '')
+            .tag(HL7_SENDING_FACILITY, msg.MSH[4]?.value ?: '')
+            .tag(HL7_MESSAGE_TYPE, msg.MSH[9][1]?.value ?: '')
+            .tag(HL7_TRIGGER_EVENT, msg.MSH[9][2]?.value ?: '')
+            .tag(HL7_PROCESSING_ID, msg.MSH[11]?.value ?: '')
+            .start()
     }
 
 }
diff --git a/commons/ihe/hl7v2/src/test/groovy/org/openehealth/ipf/commons/ihe/hl7v2/tracing/Hl7MessageSetterGetterTest.groovy b/commons/ihe/hl7v2/src/test/groovy/org/openehealth/ipf/commons/ihe/hl7v2/tracing/Hl7MessageSetterGetterTest.groovy
index 860545afea..1c42f76376 100644
--- a/commons/ihe/hl7v2/src/test/groovy/org/openehealth/ipf/commons/ihe/hl7v2/tracing/Hl7MessageSetterGetterTest.groovy
+++ b/commons/ihe/hl7v2/src/test/groovy/org/openehealth/ipf/commons/ihe/hl7v2/tracing/Hl7MessageSetterGetterTest.groovy
@@ -36,9 +36,9 @@ class Hl7MessageSetterGetterTest {
         Message r01 = MessageUtils.makeMessage(CONTEXT, 'ORU', 'R01','2.5')
         r01.addNonstandardSegment('ZTR')
         Hl7MessageSetter setter = new Hl7MessageSetter()
-        setter.put(r01, 'key1', 'value1')
-        setter.put(r01, 'key2', 'value2')
-        setter.put(r01, 'key3', 'value~with^reserved|characters')
+        setter.set(r01, 'key1', 'value1')
+        setter.set(r01, 'key2', 'value2')
+        setter.set(r01, 'key3', 'value~with^reserved|characters')
 
         assertNotNull(r01.get('ZTR'))
 
diff --git a/commons/ihe/hl7v2/src/test/groovy/org/openehealth/ipf/commons/ihe/hl7v2/tracing/MessageTracerTest.groovy b/commons/ihe/hl7v2/src/test/groovy/org/openehealth/ipf/commons/ihe/hl7v2/tracing/MessageTracerTest.groovy
index a12fdcf9b8..7a48a3872c 100644
--- a/commons/ihe/hl7v2/src/test/groovy/org/openehealth/ipf/commons/ihe/hl7v2/tracing/MessageTracerTest.groovy
+++ b/commons/ihe/hl7v2/src/test/groovy/org/openehealth/ipf/commons/ihe/hl7v2/tracing/MessageTracerTest.groovy
@@ -16,20 +16,24 @@
 
 package org.openehealth.ipf.commons.ihe.hl7v2.tracing
 
-import brave.SpanCustomizer
+import brave.Span
 import brave.Tracing
+import brave.context.slf4j.MDCScopeDecorator
+import brave.handler.MutableSpan
+import brave.handler.SpanHandler
+import brave.propagation.ThreadLocalCurrentTraceContext
+import brave.propagation.TraceContext
 import ca.uhn.hl7v2.HapiContext
 import ca.uhn.hl7v2.model.Message
+import io.micrometer.tracing.SpanCustomizer
+import io.micrometer.tracing.brave.bridge.BraveCurrentTraceContext
+import io.micrometer.tracing.brave.bridge.BravePropagator
+import io.micrometer.tracing.brave.bridge.BraveTracer
 import org.junit.jupiter.api.Test
 import org.openehealth.ipf.commons.ihe.hl7v2.definitions.HapiContextFactory
 import org.openehealth.ipf.modules.hl7.message.MessageUtils
-import zipkin2.Span
-import zipkin2.reporter.Reporter
 
-import static org.junit.jupiter.api.Assertions.assertEquals
-import static org.junit.jupiter.api.Assertions.assertNotEquals
-import static org.junit.jupiter.api.Assertions.assertFalse
-import static org.junit.jupiter.api.Assertions.assertTrue
+import static org.junit.jupiter.api.Assertions.*
 
 /**
  * @author Christian Ohr
@@ -41,12 +45,24 @@ class MessageTracerTest {
     @Test
     void traceMessage() {
         MockReporter reporter = new MockReporter()
-        Tracing tracing = Tracing.newBuilder()
+
+        // Brave setup
+        def braveCurrentTraceContext = ThreadLocalCurrentTraceContext.newBuilder()
+            .addScopeDecorator(MDCScopeDecorator.get()) // Example of Brave's automatic MDC setup
+            .build();
+        def tracing = Tracing.newBuilder()
                 .localServiceName('MessageTracerTest')
-                .spanReporter(reporter)
+                .addSpanHandler(reporter)
                 .build()
-        MessageTracer messageTracer = new MessageTracer(tracing)
-        Message sending = MessageUtils.makeMessage(CONTEXT, 'ORU', 'R01', '2.5')
+        def braveTracer = tracing.tracer();
+
+        // Micrometer Brave Bridge
+        def propagator = new BravePropagator(tracing)
+        def bridgeContext = new BraveCurrentTraceContext(braveCurrentTraceContext);
+        def tracer = new BraveTracer(braveTracer, bridgeContext);
+
+        def messageTracer = new MessageTracer(tracer, propagator)
+        def sending = MessageUtils.makeMessage(CONTEXT, 'ORU', 'R01', '2.5')
 
         messageTracer.sendMessage(sending, "producer", new Handler() {
             @Override
@@ -62,29 +78,30 @@ class MessageTracerTest {
         })
 
         // Check a few things
-        List<zipkin2.Span> spans = reporter.getSpans()
+        def spans = reporter.getSpans()
         assertEquals(2, spans.size())
 
-        Span clientSpan = reporter.spans.find { span -> span.kind() == Span.Kind.CLIENT}
-        Span serverSpan = reporter.spans.find { span -> span.kind() == Span.Kind.SERVER}
+        def clientSpan = reporter.spans.find { span -> span.kind() == Span.Kind.CLIENT}
+        def serverSpan = reporter.spans.find { span -> span.kind() == Span.Kind.SERVER}
         assertFalse(clientSpan.tags().isEmpty())
-        assertEquals(clientSpan.tags(), serverSpan.tags())
+        assertEquals(new HashMap<>(clientSpan.tags()), new HashMap<>(serverSpan.tags()))
         assertNotEquals(clientSpan.id(), serverSpan.id())
         assertEquals(clientSpan.id(), serverSpan.parentId())
-        assertTrue(clientSpan.durationAsLong() > serverSpan.durationAsLong())
     }
 
-    private static final class MockReporter implements Reporter<zipkin2.Span> {
+    class MockReporter extends SpanHandler {
 
-        private List<zipkin2.Span> spans = new ArrayList<>()
+        private List<MutableSpan> spans = new ArrayList<>();
 
         @Override
-        void report(zipkin2.Span span) {
-            spans.add(span)
+        boolean end(TraceContext context, MutableSpan span, Cause cause) {
+            spans.add(span);
+            return super.end(context, span, cause)
         }
 
-        List<zipkin2.Span> getSpans() {
+        List<MutableSpan> getSpans() {
             return spans
         }
     }
+
 }
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index 754d2b4cf4..9ac3e8e8de 100644
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -10,30 +10,29 @@
     <properties>
         <gpg-plugin-version>1.6</gpg-plugin-version>
         <bouncycastle-version>1.78</bouncycastle-version>
-        <brave-version>5.18.1</brave-version>
         <camel-version>4.4.3</camel-version>
         <!-- resolve dependency convergence between guava and hapi caffeine -->
         <checker-qual-version>3.19.0</checker-qual-version>
         <cxf-version>4.0.4</cxf-version>
         <commons-io-version>2.16.1</commons-io-version>
         <commons-compress-version>1.26.1</commons-compress-version>
-        <equinox-app.version>1.3.200-v20130910-1609</equinox-app.version>
-        <equinox-common.version>3.6.200-v20130402-1505</equinox-common.version>
-        <groovy-version>4.0.21</groovy-version>
+        <equinox-app-version>1.3.200-v20130910-1609</equinox-app-version>
+        <equinox-common-version>3.6.200-v20130402-1505</equinox-common-version>
+        <groovy-version>4.0.22</groovy-version>
         <hapi-version>2.5.1</hapi-version>
         <hapi-fhir-version>7.2.1</hapi-fhir-version>
         <herasaf-version>3.0.2</herasaf-version>
         <ipf-gazelle-version>3.0.0</ipf-gazelle-version>
         <httpclient5-version>5.3.1</httpclient5-version>
         <ipf-oht-mdht-version>1.2.0.201212201425</ipf-oht-mdht-version>
-        <!-- hapi-fhir already require jackson 2.15 while spring-boot is on 2.13 -->
-        <jackson-version>2.16.2</jackson-version>
+        <jackson-version>2.17.1</jackson-version>
         <jaxb-version>4.0.5</jaxb-version>
         <jakarta-jwsapi-version>3.0.0</jakarta-jwsapi-version>
         <jdom-version>2.0.6.1</jdom-version>
-        <kotlin.dokka.version>1.9.20</kotlin.dokka.version>
-        <kotlin.version>1.9.24</kotlin.version>
-        <kotlin.logging.version>3.0.5</kotlin.logging.version>
+        <kotlin-dokka-version>1.9.20</kotlin-dokka-version>
+        <kotlin-version>1.9.24</kotlin-version>
+        <kotlin-logging-version>3.0.5</kotlin-logging-version>
+        <micrometer-version>1.3.2</micrometer-version>
         <methanol-version>1.7.0</methanol-version>
         <nimbus-jose-jwt-version>9.37.3</nimbus-jose-jwt-version>
         <ph-schematron-version>7.1.2</ph-schematron-version>
@@ -43,7 +42,7 @@
         <spring-boot-version>3.3.1</spring-boot-version>
         <velocity-version>2.3</velocity-version>
         <vibur-version>25.0</vibur-version>
-        <woodstox-version>6.6.2</woodstox-version>
+        <woodstox-version>7.0.0</woodstox-version>
         <xmlsec-version>4.0.2</xmlsec-version>
 
 
@@ -56,6 +55,13 @@
     <dependencyManagement>
 
         <dependencies>
+            <dependency>
+                <groupId>io.micrometer</groupId>
+                <artifactId>micrometer-tracing-bom</artifactId>
+                <version>${micrometer-version}</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson</groupId>
                 <artifactId>jackson-bom</artifactId>
@@ -324,31 +330,6 @@
                     </exclusion>
                 </exclusions>
             </dependency>
-            <dependency>
-                <groupId>io.zipkin.brave</groupId>
-                <artifactId>brave</artifactId>
-                <version>${brave-version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.zipkin.brave</groupId>
-                <artifactId>brave-spring-beans</artifactId>
-                <version>${brave-version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.zipkin.brave</groupId>
-                <artifactId>brave-context-slf4j</artifactId>
-                <version>${brave-version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.zipkin.brave</groupId>
-                <artifactId>brave-instrumentation-httpclient</artifactId>
-                <version>${brave-version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.zipkin.brave</groupId>
-                <artifactId>brave-instrumentation-servlet</artifactId>
-                <version>${brave-version}</version>
-            </dependency>
             <dependency>
                 <groupId>com.github.mizosoft.methanol</groupId>
                 <artifactId>methanol</artifactId>
@@ -366,7 +347,7 @@
             </dependency>
             <dependency>
                 <groupId>org.apache.cxf</groupId>
-                <artifactId>cxf-integration-tracing-brave</artifactId>
+                <artifactId>cxf-integration-tracing-micrometer</artifactId>
                 <version>${cxf.version}</version>
             </dependency>
             <dependency>
@@ -413,7 +394,7 @@
             <dependency>
                 <groupId>org.eclipse.equinox</groupId>
                 <artifactId>app</artifactId>
-                <version>${equinox-app.version}</version>
+                <version>${equinox-app-version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.eclipse.equinox</groupId>
@@ -424,7 +405,7 @@
             <dependency>
                 <groupId>org.eclipse.equinox</groupId>
                 <artifactId>common</artifactId>
-                <version>${equinox-common.version}</version>
+                <version>${equinox-common-version}</version>
             </dependency>
             <dependency>
                 <groupId>org.openehealth.ipf.oht.mdht</groupId>
diff --git a/modules/hl7-kotlin/pom.xml b/modules/hl7-kotlin/pom.xml
index 20910bbc8c..50b1686649 100644
--- a/modules/hl7-kotlin/pom.xml
+++ b/modules/hl7-kotlin/pom.xml
@@ -58,7 +58,7 @@
         <dependency>
             <groupId>io.github.microutils</groupId>
             <artifactId>kotlin-logging-jvm</artifactId>
-            <version>${kotlin.logging.version}</version>
+            <version>${kotlin-logging-version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.jetbrains.kotlin</groupId>
@@ -132,7 +132,7 @@
             <plugin>
                 <groupId>org.jetbrains.kotlin</groupId>
                 <artifactId>kotlin-maven-plugin</artifactId>
-                <version>${kotlin.version}</version>
+                <version>${kotlin-version}</version>
                 <executions>
                     <execution>
                         <id>compile</id>
@@ -164,7 +164,7 @@
                     <plugin>
                         <groupId>org.jetbrains.dokka</groupId>
                         <artifactId>dokka-maven-plugin</artifactId>
-                        <version>${kotlin.dokka.version}</version>
+                        <version>${kotlin-dokka-version}</version>
                         <executions>
                             <execution>
                                 <phase>package</phase>
diff --git a/platform-camel/ihe/hl7v2/pom.xml b/platform-camel/ihe/hl7v2/pom.xml
index 0ed8a798f7..83c8c54b1f 100644
--- a/platform-camel/ihe/hl7v2/pom.xml
+++ b/platform-camel/ihe/hl7v2/pom.xml
@@ -45,8 +45,8 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>io.zipkin.brave</groupId>
-            <artifactId>brave</artifactId>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-tracing-bridge-brave</artifactId>
             <optional>true</optional>
         </dependency>
     </dependencies>
diff --git a/platform-camel/ihe/mllp/pom.xml b/platform-camel/ihe/mllp/pom.xml
index 1366bccee2..88328ac374 100644
--- a/platform-camel/ihe/mllp/pom.xml
+++ b/platform-camel/ihe/mllp/pom.xml
@@ -117,8 +117,13 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>io.zipkin.brave</groupId>
-            <artifactId>brave</artifactId>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-tracing</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-tracing-bridge-brave</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/platform-camel/ihe/mllp/src/test/groovy/org/openehealth/ipf/platform/camel/ihe/mllp/iti8/BraveTracerFactoryBean.java b/platform-camel/ihe/mllp/src/test/groovy/org/openehealth/ipf/platform/camel/ihe/mllp/iti8/BraveTracerFactoryBean.java
new file mode 100644
index 0000000000..a9e7ec9560
--- /dev/null
+++ b/platform-camel/ihe/mllp/src/test/groovy/org/openehealth/ipf/platform/camel/ihe/mllp/iti8/BraveTracerFactoryBean.java
@@ -0,0 +1,31 @@
+package org.openehealth.ipf.platform.camel.ihe.mllp.iti8;
+
+import brave.Tracing;
+import brave.context.slf4j.MDCScopeDecorator;
+import brave.propagation.ThreadLocalCurrentTraceContext;
+import io.micrometer.tracing.brave.bridge.BraveCurrentTraceContext;
+import io.micrometer.tracing.brave.bridge.BraveTracer;
+import org.springframework.beans.factory.FactoryBean;
+
+public class BraveTracerFactoryBean implements FactoryBean<BraveTracer> {
+
+    private final Tracing tracing;
+
+    public BraveTracerFactoryBean(Tracing tracing) {
+        this.tracing = tracing;
+    }
+
+    @Override
+    public BraveTracer getObject() throws Exception {
+        var braveCurrentTraceContext = ThreadLocalCurrentTraceContext.newBuilder()
+            .addScopeDecorator(MDCScopeDecorator.get()) // Example of Brave's automatic MDC setup
+            .build();
+        var bridgeContext = new BraveCurrentTraceContext(braveCurrentTraceContext);
+        return new BraveTracer(tracing.tracer(), bridgeContext);
+    }
+
+    @Override
+    public Class<?> getObjectType() {
+        return BraveTracer.class;
+    }
+}
diff --git a/platform-camel/ihe/mllp/src/test/groovy/org/openehealth/ipf/platform/camel/ihe/mllp/iti8/MockReporter.groovy b/platform-camel/ihe/mllp/src/test/groovy/org/openehealth/ipf/platform/camel/ihe/mllp/iti8/MockReporter.groovy
index 6c8aa8ba65..cac054fa17 100644
--- a/platform-camel/ihe/mllp/src/test/groovy/org/openehealth/ipf/platform/camel/ihe/mllp/iti8/MockReporter.groovy
+++ b/platform-camel/ihe/mllp/src/test/groovy/org/openehealth/ipf/platform/camel/ihe/mllp/iti8/MockReporter.groovy
@@ -16,21 +16,20 @@
 
 package org.openehealth.ipf.platform.camel.ihe.mllp.iti8
 
-import zipkin2.reporter.Reporter
+import brave.handler.MutableSpan
+import brave.handler.SpanHandler
+import brave.propagation.TraceContext
 
 /**
  * @author Christian Ohr
  */
-class MockReporter implements Reporter<zipkin2.Span> {
+class MockReporter extends SpanHandler {
 
-    private List<zipkin2.Span> spans = new ArrayList<>();
+    List<MutableSpan> spans = new ArrayList<>();
 
     @Override
-    void report(zipkin2.Span span) {
+    boolean end(TraceContext context, MutableSpan span, Cause cause) {
         spans.add(span);
-    }
-
-    List<zipkin2.Span> getSpans() {
-        return spans
+        return super.end(context, span, cause)
     }
 }
\ No newline at end of file
diff --git a/platform-camel/ihe/mllp/src/test/groovy/org/openehealth/ipf/platform/camel/ihe/mllp/iti8/TestIti8.groovy b/platform-camel/ihe/mllp/src/test/groovy/org/openehealth/ipf/platform/camel/ihe/mllp/iti8/TestIti8.groovy
index 33e993d47e..45459f51d8 100644
--- a/platform-camel/ihe/mllp/src/test/groovy/org/openehealth/ipf/platform/camel/ihe/mllp/iti8/TestIti8.groovy
+++ b/platform-camel/ihe/mllp/src/test/groovy/org/openehealth/ipf/platform/camel/ihe/mllp/iti8/TestIti8.groovy
@@ -15,6 +15,7 @@
  */
 package org.openehealth.ipf.platform.camel.ihe.mllp.iti8
 
+import brave.Span
 import ca.uhn.hl7v2.HL7Exception
 import ca.uhn.hl7v2.parser.PipeParser
 import org.apache.camel.Exchange
@@ -28,7 +29,6 @@ import org.openehealth.ipf.commons.ihe.core.payload.PayloadLoggerBase
 import org.openehealth.ipf.platform.camel.ihe.mllp.core.AbstractMllpTest
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.test.context.ContextConfiguration
-import zipkin2.Span
 
 import static org.junit.jupiter.api.Assertions.*
 
@@ -52,7 +52,7 @@ class TestIti8 extends AbstractMllpTest {
     static void tearDownAfterClass() {
         System.clearProperty(PayloadLoggerBase.PROPERTY_DISABLED)
     }
-    
+
     /**
      * Happy case, audit either enabled or disabled.
      * Expected result: ACK response, two or zero audit items.
@@ -61,37 +61,38 @@ class TestIti8 extends AbstractMllpTest {
     void testHappyCaseAndAudit1() {
         doTestHappyCaseAndAudit("xds-iti8://localhost:18082?timeout=${TIMEOUT}&interceptorFactories=#clientInLogger,#clientOutLogger", 2)
     }
+
     @Test
     void testHappyCaseAndAudit2() {
         doTestHappyCaseAndAudit("pix-iti8://localhost:18082?audit=true&timeout=${TIMEOUT}&interceptorFactories=#clientInLogger,#clientOutLogger", 2)
     }
+
     @Test
     void testHappyCaseAndAudit3() {
         doTestHappyCaseAndAudit("xds-iti8://localhost:18081?audit=false&timeout=${TIMEOUT}&interceptorFactories=#clientInLogger,#clientOutLogger", 0)
     }
+
     @Test
     void testHappyCaseAndTrace() {
         doTestHappyCaseAndAudit("pix-iti8://localhost:18083?interceptorFactories=#producerTracingInterceptor,#clientInLogger,#clientOutLogger&timeout=${TIMEOUT}", 2)
         assertEquals(2, reporter.spans.size())
 
-        Span clientSpan = reporter.spans.find { span -> span.kind() == Span.Kind.CLIENT}
-        Span serverSpan = reporter.spans.find { span -> span.kind() == Span.Kind.SERVER}
+        def clientSpan = reporter.spans.find { span -> span.kind() == Span.Kind.CLIENT }
+        def serverSpan = reporter.spans.find { span -> span.kind() == Span.Kind.SERVER }
 
         assertFalse(clientSpan.tags().isEmpty())
-        assertEquals(clientSpan.tags(), serverSpan.tags())
+        assertEquals(new HashMap<>(clientSpan.tags()), new HashMap<>(serverSpan.tags()))
         assertNotEquals(clientSpan.id(), serverSpan.id())
         assertEquals(clientSpan.id(), serverSpan.parentId())
-        assertTrue(clientSpan.durationAsLong() > serverSpan.durationAsLong())
-
     }
-    
+
     def doTestHappyCaseAndAudit(String endpointUri, int expectedAuditItemsCount) {
         final String body = getMessageString('ADT^A01', '2.3.1')
         def msg = send(endpointUri, body)
         assertACK(msg)
         assertAuditEvents { it.messages.size() == expectedAuditItemsCount }
     }
-    
+
     /**
      * Inacceptable messages (wrong message type, wrong trigger event, wrong version), 
      * on consumer side, audit enabled.
@@ -105,43 +106,47 @@ class TestIti8 extends AbstractMllpTest {
     void testInacceptanceOnConsumer1() {
         doTestInacceptanceOnConsumer('MDM^T01', '2.3.1')
     }
+
     @Test
     void testInacceptanceOnConsumer2() {
         doTestInacceptanceOnConsumer('ADT^A02', '2.3.1')
     }
+
     @Test
     void testInacceptanceOnConsumer3() {
         doTestInacceptanceOnConsumer('ADT^A01', '2.5')
     }
+
     @Test
     void testInacceptanceOnConsumer4() {
         doTestInacceptanceOnConsumer('ADT^A01', '3.1415926')
     }
+
     @Test
     void testInacceptanceOnConsumer5() {
         doTestInacceptanceOnConsumer('ADT^A01^ADT_A02', '2.3.1')
     }
-    
+
     def doTestInacceptanceOnConsumer(String msh9, String msh12) {
         def endpointUri = 'pix-iti8://localhost:18084'
         def endpoint = camelContext.getEndpoint(endpointUri)
         def consumer = endpoint.createConsumer(
-                [process : { Exchange e -> /* nop */ }] as Processor
-                )
+            [process: { Exchange e -> /* nop */ }] as Processor
+        )
         def processor = consumer.processor
-        
+
         def body = getMessageString(msh9, msh12)
         def exchange = new DefaultExchange(camelContext)
         exchange.in.body = body
-        
+
         processor.process(exchange)
         def response = exchange.message.body
         def msg = new PipeParser().parse(response)
         assertNAK(msg)
         assertAuditEvents { it.messages.empty }
     }
-    
-    
+
+
     /**
      * Inacceptable messages (wrong message type, wrong trigger event, wrong version), 
      * on producer side, audit enabled.
@@ -151,41 +156,44 @@ class TestIti8 extends AbstractMllpTest {
     void testInacceptanceOnProducer1() {
         doTestInacceptanceOnProducer('MDM^T01', '2.3.1')
     }
+
     @Test
     void testInacceptanceOnProducer2() {
         doTestInacceptanceOnProducer('ADT^A02', '2.3.1')
     }
+
     @Test
     void testInacceptanceOnProducer3() {
         doTestInacceptanceOnProducer('ADT^A01', '2.4')
     }
+
     @Test
     void testInacceptanceOnProducer4() {
         doTestInacceptanceOnProducer('ADT^A01', '3.1415926')
     }
+
     @Test
     void testInacceptanceOnProducer5() {
         doTestInacceptanceOnProducer('ADT^A01^ADT_A02', '2.3.1')
     }
-    
+
     def doTestInacceptanceOnProducer(String msh9, String msh12) {
         def endpointUri = "xds-iti8://localhost:18084?timeout=${TIMEOUT}&interceptorFactories=#clientInLogger,#clientOutLogger"
         def body = getMessageString(msh9, msh12)
         def failed = true
-        
+
         try {
             send(endpointUri, body)
         } catch (Exception e) {
             def cause = e.getCause()
-            if((e instanceof HL7Exception) || (cause instanceof HL7Exception))
-            {
+            if ((e instanceof HL7Exception) || (cause instanceof HL7Exception)) {
                 failed = false
             }
         }
         assertFalse(failed)
         assertAuditEvents { it.messages.empty }
     }
-    
+
 
     /**
      * Tests how the exceptions in tte route are handled.
@@ -202,14 +210,14 @@ class TestIti8 extends AbstractMllpTest {
         String isoMessage = this.getClass().classLoader.getResource('./iti8/iti8-a40-iso-8859-1.hl7')?.getText('iso-8859-1')
         doTestException("pix-iti8://localhost:18089?timeout=${TIMEOUT}", isoMessage, "java.nio.charset.MalformedInputException")
     }
-    
+
     def doTestException(String endpointUri, String body, String wantedOutputContent) {
         def msg = send(endpointUri, body)
         assertNAK(msg)
         assertTrue(msg.toString().contains(wantedOutputContent))
     }
-    
-    
+
+
     /**
      * Checks whether alternative HL7 codec factories can be used.
      */
diff --git a/platform-camel/ihe/mllp/src/test/resources/iti8/iti-8.xml b/platform-camel/ihe/mllp/src/test/resources/iti8/iti-8.xml
index 7cc1b830da..4a154dd8c8 100644
--- a/platform-camel/ihe/mllp/src/test/resources/iti8/iti-8.xml
+++ b/platform-camel/ihe/mllp/src/test/resources/iti8/iti-8.xml
@@ -33,21 +33,30 @@ http://camel.apache.org/schema/spring/camel-spring.xsd
     <bean id="mockReporter" class="org.openehealth.ipf.platform.camel.ihe.mllp.iti8.MockReporter"/>
 
     <bean id="tracing" class="brave.spring.beans.TracingFactoryBean">
-        <property name="spanReporter" ref="mockReporter"/>
+        <property name="spanHandlers" ref="mockReporter"/>
         <property name="localServiceName" value="Iti8Test"/>
         <property name="currentTraceContext">
             <bean class="brave.spring.beans.CurrentTraceContextFactoryBean">
                 <property name="scopeDecorators">
-                    <bean class="brave.context.slf4j.MDCScopeDecorator" factory-method="create"/>
+                    <bean class="brave.context.slf4j.MDCScopeDecorator" factory-method="get"/>
                 </property>
             </bean>
         </property>
     </bean>
 
-    <bean id="messageTracer" class="org.openehealth.ipf.commons.ihe.hl7v2.tracing.MessageTracer">
+    <bean id="propagator" class="io.micrometer.tracing.brave.bridge.BravePropagator">
+        <constructor-arg ref="tracing"/>
+    </bean>
+
+    <bean id="tracer" class="org.openehealth.ipf.platform.camel.ihe.mllp.iti8.BraveTracerFactoryBean">
         <constructor-arg ref="tracing"/>
     </bean>
 
+    <bean id="messageTracer" class="org.openehealth.ipf.commons.ihe.hl7v2.tracing.MessageTracer">
+        <constructor-arg ref="tracer"/>
+        <constructor-arg ref="propagator"/>
+    </bean>
+
     <bean id="consumerTracingInterceptor" class="org.openehealth.ipf.platform.camel.ihe.hl7v2.intercept.consumer.ConsumerTracingInterceptor.Factory">
         <constructor-arg ref="messageTracer"/>
     </bean>
diff --git a/pom.xml b/pom.xml
index 5dd53e3ead..953ce132f5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,12 +54,13 @@
         <site-plugin-version>3.12.1</site-plugin-version>
 
         <!-- Dependency version properties -->
-        <easymock-version>5.2.0</easymock-version>
+        <brave-version>6.0.0</brave-version>
+        <easymock-version>5.3.0</easymock-version>
         <guava-version>33.0.0-jre</guava-version>
-        <lombok-version>1.18.32</lombok-version>
+        <lombok-version>1.18.34</lombok-version>
         <mockserver-version>5.15.0</mockserver-version>
         <quickcheck-version>0.6</quickcheck-version>
-        <tomcat-version>10.1.25</tomcat-version>
+        <tomcat-version>10.1.26</tomcat-version>
         <xbean-spring-version>4.25</xbean-spring-version>
     </properties>
 
@@ -212,7 +213,24 @@
                 </exclusions>
                 <scope>test</scope>
             </dependency>
-
+            <dependency>
+                <groupId>io.zipkin.brave</groupId>
+                <artifactId>brave</artifactId>
+                <version>${brave-version}</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>io.zipkin.brave</groupId>
+                <artifactId>brave-spring-beans</artifactId>
+                <version>${brave-version}</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>io.zipkin.brave</groupId>
+                <artifactId>brave-context-slf4j</artifactId>
+                <version>${brave-version}</version>
+                <scope>test</scope>
+            </dependency>
             <dependency>
                 <groupId>net.java.quickcheck</groupId>
                 <artifactId>quickcheck</artifactId>