diff --git a/src/Elastic.OpenTelemetry/ElasticOpenTelemetryBuilder.cs b/src/Elastic.OpenTelemetry/ElasticOpenTelemetryBuilder.cs
index 46f3e706..7b6281b7 100644
--- a/src/Elastic.OpenTelemetry/ElasticOpenTelemetryBuilder.cs
+++ b/src/Elastic.OpenTelemetry/ElasticOpenTelemetryBuilder.cs
@@ -53,6 +53,10 @@ public ElasticOpenTelemetryBuilder(ElasticOpenTelemetryOptions options)
 		var openTelemetry =
 			Microsoft.Extensions.DependencyInjection.OpenTelemetryServicesExtensions.AddOpenTelemetry(Services);
 
+		//https://github.com/open-telemetry/opentelemetry-dotnet/pull/5400
+		if (!options.SkipOtlpExporter)
+			openTelemetry.UseOtlpExporter();
+
 		openTelemetry
 			.WithTracing(tracing =>
 			{
@@ -67,6 +71,7 @@ public ElasticOpenTelemetryBuilder(ElasticOpenTelemetryOptions options)
 					.AddEntityFrameworkCoreInstrumentation(); // TODO - Should we add this by default?
 
 				tracing.AddElasticProcessors(Logger);
+				Logger.LogAgentBuilderBuiltTracerProvider();
 			})
 			.WithMetrics(metrics =>
 			{
@@ -82,21 +87,6 @@ public ElasticOpenTelemetryBuilder(ElasticOpenTelemetryOptions options)
 					.AddProcessInstrumentation()
 					.AddRuntimeInstrumentation()
 					.AddHttpClientInstrumentation();
-			});
-
-		openTelemetry
-			.WithTracing(tracing =>
-			{
-				if (!options.SkipOtlpExporter)
-					tracing.AddOtlpExporter(options.OtlpExporterName, _ => { });
-				Logger.LogAgentBuilderBuiltTracerProvider();
-			})
-			.WithMetrics(metrics =>
-			{
-				if (!options.SkipOtlpExporter)
-				{
-					metrics.AddOtlpExporter(options.OtlpExporterName, _ => { });
-				}
 				Logger.LogAgentBuilderBuiltMeterProvider();
 			});