diff --git a/BMA.EHR.Leave/Program.cs b/BMA.EHR.Leave/Program.cs
index 1b868cfb..e25a59fe 100644
--- a/BMA.EHR.Leave/Program.cs
+++ b/BMA.EHR.Leave/Program.cs
@@ -97,9 +97,12 @@ builder.Services.AddLeavePersistence(builder.Configuration);
 builder.Services.AddTransient<HolidayService>();
 
 // Configure HttpClient with increased timeout for long-running operations (e.g., RabbitMQ Management API)
-builder.Services.AddHttpClient<HttpClient>(client =>
+builder.Services.AddHttpClient();
+builder.Services.AddTransient(sp =>
 {
-    client.Timeout = TimeSpan.FromMinutes(10); // Set timeout to 10 minutes
+    var httpClient = sp.GetRequiredService<IHttpClientFactory>().CreateClient();
+    httpClient.Timeout = TimeSpan.FromMinutes(10); // Set timeout to 10 minutes
+    return httpClient;
 });
 
 builder.Services.AddControllers(options =>