diff --git a/TmsRunner/Program.cs b/TmsRunner/Program.cs
index 03c4664..4d89050 100644
--- a/TmsRunner/Program.cs
+++ b/TmsRunner/Program.cs
@@ -108,15 +108,12 @@ private static ServiceProvider BuildServices(string[] args)
     {
         var serviceCollection = new ServiceCollection();
 
-        serviceCollection.AddHttpClient(nameof(HttpClientNames.Default), client =>
+        serviceCollection
+            .AddSingleton(provider => new HttpClient()
             {
-                client.DefaultVersionPolicy = HttpVersionPolicy.RequestVersionOrHigher;
-                client.DefaultRequestVersion = HttpVersion.Version10;
+                DefaultVersionPolicy = HttpVersionPolicy.RequestVersionOrHigher,
+                DefaultRequestVersion = HttpVersion.Version10
             })
-            .SetHandlerLifetime(TimeSpan.FromMinutes(20))
-            .AddPolicyHandler(RetryPolicy);
-
-        serviceCollection
             .AddSingleton(GetAdapterConfiguration(args))
             .AddSingleton(provider => ConfigurationManager.Configure(
                 provider.GetRequiredService<AdapterConfig>().ToInternalConfig(),
@@ -133,17 +130,17 @@ private static ServiceProvider BuildServices(string[] args)
                 ServerCertificateCustomValidationCallback = (_, _, _, _) => provider.GetRequiredService<TmsSettings>().CertValidation
             })
             .AddTransient<IAttachmentsApiAsync, AttachmentsApi>(provider => new AttachmentsApi(
-                provider.GetRequiredService<IHttpClientFactory>().CreateClient(nameof(HttpClientNames.Default)),
+                provider.GetRequiredService<HttpClient>(),
                 provider.GetRequiredService<TestIT.ApiClient.Client.Configuration>(),
                 provider.GetRequiredService<HttpClientHandler>()
             ))
             .AddTransient<ITestRunsApiAsync, TestRunsApi>(provider => new TestRunsApi(
-                provider.GetRequiredService<IHttpClientFactory>().CreateClient(nameof(HttpClientNames.Default)),
+                provider.GetRequiredService<HttpClient>(),
                 provider.GetRequiredService<TestIT.ApiClient.Client.Configuration>(),
                 provider.GetRequiredService<HttpClientHandler>()
             ))
             .AddTransient<IAutoTestsApiAsync, AutoTestsApi>(provider => new AutoTestsApi(
-                provider.GetRequiredService<IHttpClientFactory>().CreateClient(nameof(HttpClientNames.Default)),
+                provider.GetRequiredService<HttpClient>(),
                 provider.GetRequiredService<TestIT.ApiClient.Client.Configuration>(),
                 provider.GetRequiredService<HttpClientHandler>()
             ))