diff --git a/docker/otel-collector-config.yaml b/docker/otel-collector-config.yaml
index a1aaced1b..6cf8cefaf 100644
--- a/docker/otel-collector-config.yaml
+++ b/docker/otel-collector-config.yaml
@@ -41,7 +41,7 @@ service:
       exporters: [ datadog ]
     traces:
       receivers: [ otlp ]
-      processors: [ batch, tail_sampling ]  # Added tail_sampling to the main traces pipeline
+      processors: [ batch ]  # Added tail_sampling to the main traces pipeline
       exporters: [ debug, datadog ]  # Directly exporting to debug and datadog
     logs:
       receivers: [ otlp ]
diff --git a/src/modules/Elsa.OpenTelemetry/Middleware/OpenTelemetryTracingActivityExecutionMiddleware.cs b/src/modules/Elsa.OpenTelemetry/Middleware/OpenTelemetryTracingActivityExecutionMiddleware.cs
index b09895521..043a11092 100644
--- a/src/modules/Elsa.OpenTelemetry/Middleware/OpenTelemetryTracingActivityExecutionMiddleware.cs
+++ b/src/modules/Elsa.OpenTelemetry/Middleware/OpenTelemetryTracingActivityExecutionMiddleware.cs
@@ -43,7 +43,7 @@ public class OpenTelemetryTracingActivityExecutionMiddleware(ActivityMiddlewareD
             span.AddEvent(new ActivityEvent("Faulted", tags: CreateStatusTags(context)));
             span.SetStatus(ActivityStatusCode.Error);
             span.SetTag("error", true);
-            span.SetTag("hasIncidents", true);
+            span.SetTag("activityInstance.hasIncidents", true);
 
             var errorMessage = string.IsNullOrWhiteSpace(context.Exception?.Message) ? "Unknown error" : context.Exception.Message;
             span.SetTag("error.message", errorMessage);
diff --git a/src/modules/Elsa.OpenTelemetry/Middleware/OpenTelemetryTracingWorkflowExecutionMiddleware.cs b/src/modules/Elsa.OpenTelemetry/Middleware/OpenTelemetryTracingWorkflowExecutionMiddleware.cs
index 56e2ef17d..f374f1a78 100644
--- a/src/modules/Elsa.OpenTelemetry/Middleware/OpenTelemetryTracingWorkflowExecutionMiddleware.cs
+++ b/src/modules/Elsa.OpenTelemetry/Middleware/OpenTelemetryTracingWorkflowExecutionMiddleware.cs
@@ -35,9 +35,6 @@ public class OpenTelemetryTracingWorkflowExecutionMiddleware(WorkflowMiddlewareD
             return;
         }
 
-        if (!string.IsNullOrWhiteSpace(context.CorrelationId))
-            span.SetTag("correlationId", context.CorrelationId);
-
         span.SetTag("workflowInstance.id", workflowInstanceId);
         span.SetTag("workflowDefinition.definitionId", workflow.Identity.DefinitionId);
         span.SetTag("workflowDefinition.version", workflow.Identity.Version);
@@ -61,7 +58,7 @@ public class OpenTelemetryTracingWorkflowExecutionMiddleware(WorkflowMiddlewareD
         if(context.Incidents.Any())
         {
             span.SetStatus(ActivityStatusCode.Error);
-            span.SetTag("hasIncidents", true);
+            span.SetTag("workflowInstance.hasIncidents", true);
             span.SetTag("error", true);
 
             if (context.Incidents.Count > 0)
@@ -69,7 +66,7 @@ public class OpenTelemetryTracingWorkflowExecutionMiddleware(WorkflowMiddlewareD
         }
         
         if (!string.IsNullOrWhiteSpace(context.CorrelationId))
-            span.SetTag("correlationId", context.CorrelationId);
+            span.SetTag("workflowInstance.correlationId", context.CorrelationId);
         
         var now = systemClock.UtcNow;
         span.SetTag("workflowExecution.endTimeUtc", now);