diff --git a/TransactionProcessing.MerchantPos/Program.cs b/TransactionProcessing.MerchantPos/Program.cs
index ad49f2e..5fe71f1 100644
--- a/TransactionProcessing.MerchantPos/Program.cs
+++ b/TransactionProcessing.MerchantPos/Program.cs
@@ -14,6 +14,7 @@
 using TransactionProcessing.MerchantPos.Runtime;
 using TransactionProcessor.Client;
 using ILogger = Microsoft.Extensions.Logging.ILogger;
+using ClientProxyBase;
 
 var logger = LogManager.Setup().LoadConfigurationFromFile("nlog.config").GetCurrentClassLogger();
 try
@@ -78,8 +79,9 @@
     // Repos + services
     builder.Services.AddScoped<IEfRepository, EfRepository>();
     builder.Services.AddScoped<IApiClient, ApiClient>();
-    builder.Services.AddSingleton<ISecurityServiceClient, SecurityServiceClient>();
-    builder.Services.AddSingleton<ITransactionProcessorClient, TransactionProcessorClient>();
+    builder.Services.AddHttpContextAccessor();
+    builder.Services.RegisterHttpClient<ISecurityServiceClient, SecurityServiceClient>();
+    builder.Services.RegisterHttpClient<ITransactionProcessorClient, TransactionProcessorClient>();
     builder.Services.AddHttpClient();
 
     builder.Services.AddScoped<MerchantRuntime>();