diff --git a/src/A2A.Client.Abstractions/A2A.Client.Abstractions.csproj b/src/A2A.Client.Abstractions/A2A.Client.Abstractions.csproj
index 40ddea1..9dca3ab 100644
--- a/src/A2A.Client.Abstractions/A2A.Client.Abstractions.csproj
+++ b/src/A2A.Client.Abstractions/A2A.Client.Abstractions.csproj
@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	<RootNamespace>A2A.Client</RootNamespace>
-    <VersionPrefix>0.17.0</VersionPrefix>
+    <VersionPrefix>0.18.0</VersionPrefix>
     <AssemblyVersion>$(VersionPrefix)</AssemblyVersion>
     <FileVersion>$(VersionPrefix)</FileVersion>
     <NeutralLanguage>en</NeutralLanguage>
diff --git a/src/A2A.Client.Transports.Grpc/A2A.Client.Transports.Grpc.csproj b/src/A2A.Client.Transports.Grpc/A2A.Client.Transports.Grpc.csproj
index c8ef900..e27d9d0 100644
--- a/src/A2A.Client.Transports.Grpc/A2A.Client.Transports.Grpc.csproj
+++ b/src/A2A.Client.Transports.Grpc/A2A.Client.Transports.Grpc.csproj
@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	<RootNamespace>A2A.Client.Transports</RootNamespace>
-    <VersionPrefix>0.17.0</VersionPrefix>
+    <VersionPrefix>0.18.0</VersionPrefix>
     <AssemblyVersion>$(VersionPrefix)</AssemblyVersion>
     <FileVersion>$(VersionPrefix)</FileVersion>
     <NeutralLanguage>en</NeutralLanguage>
diff --git a/src/A2A.Client.Transports.Http/A2A.Client.Transports.Http.csproj b/src/A2A.Client.Transports.Http/A2A.Client.Transports.Http.csproj
index 99d5e0f..89a2d25 100644
--- a/src/A2A.Client.Transports.Http/A2A.Client.Transports.Http.csproj
+++ b/src/A2A.Client.Transports.Http/A2A.Client.Transports.Http.csproj
@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	<RootNamespace>A2A.Client.Transports</RootNamespace>
-    <VersionPrefix>0.17.0</VersionPrefix>
+    <VersionPrefix>0.18.0</VersionPrefix>
     <AssemblyVersion>$(VersionPrefix)</AssemblyVersion>
     <FileVersion>$(VersionPrefix)</FileVersion>
     <NeutralLanguage>en</NeutralLanguage>
diff --git a/src/A2A.Client.Transports.Http/Extensions/A2AClientBuilderExtensions.cs b/src/A2A.Client.Transports.Http/Extensions/A2AClientBuilderExtensions.cs
index 32ec572..78e9cda 100644
--- a/src/A2A.Client.Transports.Http/Extensions/A2AClientBuilderExtensions.cs
+++ b/src/A2A.Client.Transports.Http/Extensions/A2AClientBuilderExtensions.cs
@@ -26,17 +26,36 @@ public static class A2AClientBuilderExtensions
     /// Configures the <see cref="IA2AClientBuilder"/> to use the HTTP transport.
     /// </summary>
     /// <param name="builder">The <see cref="IA2AClientBuilder"/> to configure.</param>
-    /// <param name="baseAddress">The based address of the server to connect to.</param>
+    /// <param name="configureClient">An <see cref="Action{T1, T2}"/> used to configure the underlying <see cref="HttpClient"/>.</param>
+    /// <param name="configureClientBuilder"> An <see cref="Action{T}"/>, if any, used to configure the <see cref="IHttpClientBuilder"/> used to build the underlying <see cref="HttpClient"/>.</param>
     /// <returns>The configured <see cref="IA2AClientBuilder"/>.</returns>
-    public static IA2AClientBuilder UseHttpTransport(this IA2AClientBuilder builder, Uri baseAddress)
+    public static IA2AClientBuilder UseHttpTransport(this IA2AClientBuilder builder, Action<IServiceProvider, HttpClient> configureClient, Action<IHttpClientBuilder>? configureClientBuilder = null)
     {
-        builder.Services.AddHttpClient<A2AHttpClientTransport>(httpClient =>
+        var httpClientBuilder = builder.Services.AddHttpClient<IA2AClientTransport, A2AHttpClientTransport>((provider, httpClient) =>
         {
-            httpClient.BaseAddress = baseAddress;
             httpClient.DefaultRequestHeaders.Add("A2A-Version", A2AProtocolVersion.Latest);
+            configureClient(provider, httpClient);
         });
-        builder.Services.AddSingleton<IA2AClientTransport>(provider => provider.GetRequiredService<A2AHttpClientTransport>());
+        configureClientBuilder?.Invoke(httpClientBuilder);
         return builder.UseTransport<A2AHttpClientTransport>();
     }
 
+    /// <summary>
+    /// Configures the <see cref="IA2AClientBuilder"/> to use the HTTP transport.
+    /// </summary>
+    /// <param name="builder">The <see cref="IA2AClientBuilder"/> to configure.</param>
+    /// <param name="configureClient">An <see cref="Action{T}"/> used to configure the underlying <see cref="HttpClient"/>.</param>
+    /// <param name="configureClientBuilder"> An <see cref="Action{T}"/>, if any, used to configure the <see cref="IHttpClientBuilder"/> used to build the underlying <see cref="HttpClient"/>.</param>
+    /// <returns>The configured <see cref="IA2AClientBuilder"/>.</returns>
+    public static IA2AClientBuilder UseHttpTransport(this IA2AClientBuilder builder, Action<HttpClient> configureClient, Action<IHttpClientBuilder>? configureClientBuilder = null) => UseHttpTransport(builder, (_, httpClient) => configureClient(httpClient), configureClientBuilder);
+
+    /// <summary>
+    /// Configures the <see cref="IA2AClientBuilder"/> to use the HTTP transport.
+    /// </summary>
+    /// <param name="builder">The <see cref="IA2AClientBuilder"/> to configure.</param>
+    /// <param name="baseAddress">The based address of the server to connect to.</param>
+    /// <param name="configureClientBuilder"> An <see cref="Action{T}"/>, if any, used to configure the <see cref="IHttpClientBuilder"/> used to build the underlying <see cref="HttpClient"/>.</param>
+    /// <returns>The configured <see cref="IA2AClientBuilder"/>.</returns>
+    public static IA2AClientBuilder UseHttpTransport(this IA2AClientBuilder builder, Uri baseAddress, Action<IHttpClientBuilder>? configureClientBuilder = null) => UseHttpTransport(builder, httpClient => httpClient.BaseAddress = baseAddress, configureClientBuilder);
+
 }
diff --git a/src/A2A.Client.Transports.JsonRpc/A2A.Client.Transports.JsonRpc.csproj b/src/A2A.Client.Transports.JsonRpc/A2A.Client.Transports.JsonRpc.csproj
index caedf45..0016e2a 100644
--- a/src/A2A.Client.Transports.JsonRpc/A2A.Client.Transports.JsonRpc.csproj
+++ b/src/A2A.Client.Transports.JsonRpc/A2A.Client.Transports.JsonRpc.csproj
@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	<RootNamespace>A2A.Client.Transports</RootNamespace>
-    <VersionPrefix>0.17.0</VersionPrefix>
+    <VersionPrefix>0.18.0</VersionPrefix>
     <AssemblyVersion>$(VersionPrefix)</AssemblyVersion>
     <FileVersion>$(VersionPrefix)</FileVersion>
     <NeutralLanguage>en</NeutralLanguage>
diff --git a/src/A2A.Client.Transports.JsonRpc/Extensions/A2AClientBuilderExtensions.cs b/src/A2A.Client.Transports.JsonRpc/Extensions/A2AClientBuilderExtensions.cs
index ade663f..cc538d6 100644
--- a/src/A2A.Client.Transports.JsonRpc/Extensions/A2AClientBuilderExtensions.cs
+++ b/src/A2A.Client.Transports.JsonRpc/Extensions/A2AClientBuilderExtensions.cs
@@ -26,17 +26,36 @@ public static class A2AClientBuilderExtensions
     /// Configures the <see cref="IA2AClientBuilder"/> to use the JSON-RPC transport.
     /// </summary>
     /// <param name="builder">The <see cref="IA2AClientBuilder"/> to configure.</param>
-    /// <param name="baseAddress">The based address of the server to connect to.</param>
+    /// <param name="configureClient">An <see cref="Action{T1, T2}"/> used to configure the underlying <see cref="HttpClient"/>.</param>
+    /// <param name="configureClientBuilder"> An <see cref="Action{T}"/>, if any, used to configure the <see cref="IHttpClientBuilder"/> used to build the underlying <see cref="HttpClient"/>.</param>
     /// <returns>The configured <see cref="IA2AClientBuilder"/>.</returns>
-    public static IA2AClientBuilder UseJsonRpcTransport(this IA2AClientBuilder builder, Uri baseAddress)
+    public static IA2AClientBuilder UseJsonRpcTransport(this IA2AClientBuilder builder, Action<IServiceProvider, HttpClient> configureClient, Action<IHttpClientBuilder>? configureClientBuilder = null)
     {
-        builder.Services.AddHttpClient<A2AJsonRpcClientTransport>(httpClient =>
+        var httpClientBuilder = builder.Services.AddHttpClient<IA2AClientTransport, A2AJsonRpcClientTransport>((provider, httpClient) =>
         {
-            httpClient.BaseAddress = baseAddress;
             httpClient.DefaultRequestHeaders.Add("A2A-Version", A2AProtocolVersion.Latest);
+            configureClient(provider, httpClient);
         });
-        builder.Services.AddSingleton<IA2AClientTransport>(provider => provider.GetRequiredService<A2AJsonRpcClientTransport>());
+        configureClientBuilder?.Invoke(httpClientBuilder);
         return builder.UseTransport<A2AJsonRpcClientTransport>();
     }
 
+    /// <summary>
+    /// Configures the <see cref="IA2AClientBuilder"/> to use the JSON-RPC transport.
+    /// </summary>
+    /// <param name="builder">The <see cref="IA2AClientBuilder"/> to configure.</param>
+    /// <param name="configureClient">An <see cref="Action{T}"/> used to configure the underlying <see cref="HttpClient"/>.</param>
+    /// <param name="configureClientBuilder"> An <see cref="Action{T}"/>, if any, used to configure the <see cref="IHttpClientBuilder"/> used to build the underlying <see cref="HttpClient"/>.</param>
+    /// <returns>The configured <see cref="IA2AClientBuilder"/>.</returns>
+    public static IA2AClientBuilder UseJsonRpcTransport(this IA2AClientBuilder builder, Action<HttpClient> configureClient, Action<IHttpClientBuilder>? configureClientBuilder = null) => UseJsonRpcTransport(builder, (_, httpClient) => configureClient(httpClient), configureClientBuilder);
+
+    /// <summary>
+    /// Configures the <see cref="IA2AClientBuilder"/> to use the JSON-RPC transport.
+    /// </summary>
+    /// <param name="builder">The <see cref="IA2AClientBuilder"/> to configure.</param>
+    /// <param name="baseAddress">The based address of the server to connect to.</param>
+    /// <param name="configureClientBuilder"> An <see cref="Action{T}"/>, if any, used to configure the <see cref="IHttpClientBuilder"/> used to build the underlying <see cref="HttpClient"/>.</param>
+    /// <returns>The configured <see cref="IA2AClientBuilder"/>.</returns>
+    public static IA2AClientBuilder UseJsonRpcTransport(this IA2AClientBuilder builder, Uri baseAddress, Action<IHttpClientBuilder>? configureClientBuilder = null) => UseJsonRpcTransport(builder, httpClient => httpClient.BaseAddress = baseAddress, configureClientBuilder);
+
 }
diff --git a/src/A2A.Client/A2A.Client.csproj b/src/A2A.Client/A2A.Client.csproj
index 48591fc..4d1952c 100644
--- a/src/A2A.Client/A2A.Client.csproj
+++ b/src/A2A.Client/A2A.Client.csproj
@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	<RootNamespace>A2A.Client</RootNamespace>
-    <VersionPrefix>0.17.0</VersionPrefix>
+    <VersionPrefix>0.18.0</VersionPrefix>
     <AssemblyVersion>$(VersionPrefix)</AssemblyVersion>
     <FileVersion>$(VersionPrefix)</FileVersion>
     <NeutralLanguage>en</NeutralLanguage>
diff --git a/src/A2A.Core.JsonRpc/A2A.Core.JsonRpc.csproj b/src/A2A.Core.JsonRpc/A2A.Core.JsonRpc.csproj
index 18f13c1..03cdc44 100644
--- a/src/A2A.Core.JsonRpc/A2A.Core.JsonRpc.csproj
+++ b/src/A2A.Core.JsonRpc/A2A.Core.JsonRpc.csproj
@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	<RootNamespace>A2A</RootNamespace>
-    <VersionPrefix>0.17.0</VersionPrefix>
+    <VersionPrefix>0.18.0</VersionPrefix>
     <AssemblyVersion>$(VersionPrefix)</AssemblyVersion>
     <FileVersion>$(VersionPrefix)</FileVersion>
     <NeutralLanguage>en</NeutralLanguage>
diff --git a/src/A2A.Core/A2A.Core.csproj b/src/A2A.Core/A2A.Core.csproj
index 7fdca5e..3039a0a 100644
--- a/src/A2A.Core/A2A.Core.csproj
+++ b/src/A2A.Core/A2A.Core.csproj
@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	<RootNamespace>A2A</RootNamespace>
-    <VersionPrefix>0.17.0</VersionPrefix>
+    <VersionPrefix>0.18.0</VersionPrefix>
     <AssemblyVersion>$(VersionPrefix)</AssemblyVersion>
     <FileVersion>$(VersionPrefix)</FileVersion>
     <NeutralLanguage>en</NeutralLanguage>
diff --git a/src/A2A.Extensions.A2UI/A2A.Extensions.A2UI.csproj b/src/A2A.Extensions.A2UI/A2A.Extensions.A2UI.csproj
index f82462b..c5c1fff 100644
--- a/src/A2A.Extensions.A2UI/A2A.Extensions.A2UI.csproj
+++ b/src/A2A.Extensions.A2UI/A2A.Extensions.A2UI.csproj
@@ -6,7 +6,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	<RootNamespace>A2A.Extensions</RootNamespace>
-    <VersionPrefix>0.17.0</VersionPrefix>
+    <VersionPrefix>0.18.0</VersionPrefix>
     <AssemblyVersion>$(VersionPrefix)</AssemblyVersion>
     <FileVersion>$(VersionPrefix)</FileVersion>
     <NeutralLanguage>en</NeutralLanguage>
diff --git a/src/A2A.Server.Abstractions/A2A.Server.Abstractions.csproj b/src/A2A.Server.Abstractions/A2A.Server.Abstractions.csproj
index 676efbf..6d0f902 100644
--- a/src/A2A.Server.Abstractions/A2A.Server.Abstractions.csproj
+++ b/src/A2A.Server.Abstractions/A2A.Server.Abstractions.csproj
@@ -6,7 +6,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	<RootNamespace>A2A.Server</RootNamespace>
-    <VersionPrefix>0.17.0</VersionPrefix>
+    <VersionPrefix>0.18.0</VersionPrefix>
     <AssemblyVersion>$(VersionPrefix)</AssemblyVersion>
     <FileVersion>$(VersionPrefix)</FileVersion>
     <NeutralLanguage>en</NeutralLanguage>
diff --git a/src/A2A.Server.AspNetCore/A2A.Server.csproj b/src/A2A.Server.AspNetCore/A2A.Server.csproj
index 51b9db4..986b7de 100644
--- a/src/A2A.Server.AspNetCore/A2A.Server.csproj
+++ b/src/A2A.Server.AspNetCore/A2A.Server.csproj
@@ -6,7 +6,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	<RootNamespace>A2A.Server</RootNamespace>
-    <VersionPrefix>0.17.0</VersionPrefix>
+    <VersionPrefix>0.18.0</VersionPrefix>
     <AssemblyVersion>$(VersionPrefix)</AssemblyVersion>
     <FileVersion>$(VersionPrefix)</FileVersion>
     <NeutralLanguage>en</NeutralLanguage>
diff --git a/src/A2A.Server.Persistence.Memory/A2A.Server.Persistence.Memory.csproj b/src/A2A.Server.Persistence.Memory/A2A.Server.Persistence.Memory.csproj
index 40efccc..e0bb0c2 100644
--- a/src/A2A.Server.Persistence.Memory/A2A.Server.Persistence.Memory.csproj
+++ b/src/A2A.Server.Persistence.Memory/A2A.Server.Persistence.Memory.csproj
@@ -6,7 +6,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	<RootNamespace>A2A.Server</RootNamespace>
-    <VersionPrefix>0.17.0</VersionPrefix>
+    <VersionPrefix>0.18.0</VersionPrefix>
     <AssemblyVersion>$(VersionPrefix)</AssemblyVersion>
     <FileVersion>$(VersionPrefix)</FileVersion>
     <NeutralLanguage>en</NeutralLanguage>
diff --git a/src/A2A.Server.Persistence.Redis/A2A.Server.Persistence.Redis.csproj b/src/A2A.Server.Persistence.Redis/A2A.Server.Persistence.Redis.csproj
index d4044dd..d19640f 100644
--- a/src/A2A.Server.Persistence.Redis/A2A.Server.Persistence.Redis.csproj
+++ b/src/A2A.Server.Persistence.Redis/A2A.Server.Persistence.Redis.csproj
@@ -6,7 +6,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	<RootNamespace>A2A.Server</RootNamespace>
-    <VersionPrefix>0.17.0</VersionPrefix>
+    <VersionPrefix>0.18.0</VersionPrefix>
     <AssemblyVersion>$(VersionPrefix)</AssemblyVersion>
     <FileVersion>$(VersionPrefix)</FileVersion>
     <NeutralLanguage>en</NeutralLanguage>
diff --git a/src/A2A.Server.Scheduling.Memory/A2A.Server.Scheduling.Memory.csproj b/src/A2A.Server.Scheduling.Memory/A2A.Server.Scheduling.Memory.csproj
index b70c978..dcee92d 100644
--- a/src/A2A.Server.Scheduling.Memory/A2A.Server.Scheduling.Memory.csproj
+++ b/src/A2A.Server.Scheduling.Memory/A2A.Server.Scheduling.Memory.csproj
@@ -6,7 +6,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	<RootNamespace>A2A.Server</RootNamespace>
-    <VersionPrefix>0.17.0</VersionPrefix>
+    <VersionPrefix>0.18.0</VersionPrefix>
     <AssemblyVersion>$(VersionPrefix)</AssemblyVersion>
     <FileVersion>$(VersionPrefix)</FileVersion>
     <NeutralLanguage>en</NeutralLanguage>
diff --git a/src/A2A.Server.Scheduling.Quartz/A2A.Server.Scheduling.Quartz.csproj b/src/A2A.Server.Scheduling.Quartz/A2A.Server.Scheduling.Quartz.csproj
index 00d6c25..e04c8e8 100644
--- a/src/A2A.Server.Scheduling.Quartz/A2A.Server.Scheduling.Quartz.csproj
+++ b/src/A2A.Server.Scheduling.Quartz/A2A.Server.Scheduling.Quartz.csproj
@@ -6,7 +6,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	<RootNamespace>A2A.Server</RootNamespace>
-    <VersionPrefix>0.17.0</VersionPrefix>
+    <VersionPrefix>0.18.0</VersionPrefix>
     <AssemblyVersion>$(VersionPrefix)</AssemblyVersion>
     <FileVersion>$(VersionPrefix)</FileVersion>
     <NeutralLanguage>en</NeutralLanguage>
diff --git a/src/A2A.Server.Transports.Grpc/A2A.Server.Transports.Grpc.csproj b/src/A2A.Server.Transports.Grpc/A2A.Server.Transports.Grpc.csproj
index bb3adc8..f42364c 100644
--- a/src/A2A.Server.Transports.Grpc/A2A.Server.Transports.Grpc.csproj
+++ b/src/A2A.Server.Transports.Grpc/A2A.Server.Transports.Grpc.csproj
@@ -6,7 +6,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	<RootNamespace>A2A.Server.Transports</RootNamespace>
-    <VersionPrefix>0.17.0</VersionPrefix>
+    <VersionPrefix>0.18.0</VersionPrefix>
     <AssemblyVersion>$(VersionPrefix)</AssemblyVersion>
     <FileVersion>$(VersionPrefix)</FileVersion>
     <NeutralLanguage>en</NeutralLanguage>
diff --git a/src/A2A.Server.Transports.Http/A2A.Server.Transports.Http.csproj b/src/A2A.Server.Transports.Http/A2A.Server.Transports.Http.csproj
index 760cf13..2b3f78f 100644
--- a/src/A2A.Server.Transports.Http/A2A.Server.Transports.Http.csproj
+++ b/src/A2A.Server.Transports.Http/A2A.Server.Transports.Http.csproj
@@ -6,7 +6,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	<RootNamespace>A2A.Server.Transports</RootNamespace>
-    <VersionPrefix>0.17.0</VersionPrefix>
+    <VersionPrefix>0.18.0</VersionPrefix>
     <AssemblyVersion>$(VersionPrefix)</AssemblyVersion>
     <FileVersion>$(VersionPrefix)</FileVersion>
     <NeutralLanguage>en</NeutralLanguage>
diff --git a/src/A2A.Server.Transports.JsonRpc/A2A.Server.Transports.JsonRpc.csproj b/src/A2A.Server.Transports.JsonRpc/A2A.Server.Transports.JsonRpc.csproj
index e19c89a..e249768 100644
--- a/src/A2A.Server.Transports.JsonRpc/A2A.Server.Transports.JsonRpc.csproj
+++ b/src/A2A.Server.Transports.JsonRpc/A2A.Server.Transports.JsonRpc.csproj
@@ -6,7 +6,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	<RootNamespace>A2A.Server.Transports</RootNamespace>
-    <VersionPrefix>0.17.0</VersionPrefix>
+    <VersionPrefix>0.18.0</VersionPrefix>
     <AssemblyVersion>$(VersionPrefix)</AssemblyVersion>
     <FileVersion>$(VersionPrefix)</FileVersion>
     <NeutralLanguage>en</NeutralLanguage>