diff --git a/BMA.EHR.Command.Service/Program.cs b/BMA.EHR.Command.Service/Program.cs
index b9d846f4..ea76fb2b 100644
--- a/BMA.EHR.Command.Service/Program.cs
+++ b/BMA.EHR.Command.Service/Program.cs
@@ -115,12 +115,15 @@ var app = builder.Build();
     
     app.UseHttpsRedirection();
     app.UseCors();
+    
+    app.UseMiddleware<CombinedErrorHandlerAndLoggingMiddleware>();
+    
     app.UseAuthentication();
     app.UseAuthorization();
     app.UseDefaultFiles();
     app.UseStaticFiles();
     app.MapControllers();
-    app.UseMiddleware<ErrorHandlerMiddleware>();
+   
 
     // apply migrations
     //await using var scope = app.Services.CreateAsyncScope();
diff --git a/BMA.EHR.Discipline.Service/Program.cs b/BMA.EHR.Discipline.Service/Program.cs
index 4ead4ce6..5a1f99c4 100644
--- a/BMA.EHR.Discipline.Service/Program.cs
+++ b/BMA.EHR.Discipline.Service/Program.cs
@@ -148,13 +148,15 @@ var app = builder.Build();
 
     app.UseHttpsRedirection();
     app.UseCors();
+    
+    app.UseMiddleware<CombinedErrorHandlerAndLoggingMiddleware>();
     app.UseAuthentication();
     app.UseAuthorization();
     app.UseDefaultFiles();
     app.UseStaticFiles();
     app.MapControllers();
-    app.UseMiddleware<ErrorHandlerMiddleware>();
-    app.UseMiddleware<RequestLoggingMiddleware>();
+    // app.UseMiddleware<ErrorHandlerMiddleware>();
+    // app.UseMiddleware<RequestLoggingMiddleware>();
 
     app.UseHangfireDashboard("/hangfire", new DashboardOptions()
     {
diff --git a/BMA.EHR.Insignia/Program.cs b/BMA.EHR.Insignia/Program.cs
index 4ccbb492..2b8f4537 100644
--- a/BMA.EHR.Insignia/Program.cs
+++ b/BMA.EHR.Insignia/Program.cs
@@ -164,13 +164,14 @@ var app = builder.Build();
 
     app.UseHttpsRedirection();
     app.UseCors();
+    app.UseMiddleware<CombinedErrorHandlerAndLoggingMiddleware>();
     app.UseAuthentication();
     app.UseAuthorization();
     app.UseDefaultFiles();
     app.UseStaticFiles();
     app.MapControllers();
-    app.UseMiddleware<ErrorHandlerMiddleware>();
-    app.UseMiddleware<RequestLoggingMiddleware>();
+    // app.UseMiddleware<ErrorHandlerMiddleware>();
+    // app.UseMiddleware<RequestLoggingMiddleware>();
     app.UseHangfireDashboard("/hangfire", new DashboardOptions()
     {
         Authorization = new[] { new CustomAuthorizeFilter() }
diff --git a/BMA.EHR.MetaData.Service/Program.cs b/BMA.EHR.MetaData.Service/Program.cs
index 6032b868..2ade94f1 100644
--- a/BMA.EHR.MetaData.Service/Program.cs
+++ b/BMA.EHR.MetaData.Service/Program.cs
@@ -131,12 +131,13 @@ var app = builder.Build();
 
     app.UseHttpsRedirection();
     app.UseCors();
+    app.UseMiddleware<CombinedErrorHandlerAndLoggingMiddleware>();
     app.UseAuthentication();
     app.UseAuthorization();
     app.UseDefaultFiles();
     app.UseStaticFiles();
     app.MapControllers();
-    app.UseMiddleware<ErrorHandlerMiddleware>();
+    //app.UseMiddleware<ErrorHandlerMiddleware>();
 
     // apply migrations
     await using var scope = app.Services.CreateAsyncScope();
diff --git a/BMA.EHR.OrganizationEmployee.Service/Program.cs b/BMA.EHR.OrganizationEmployee.Service/Program.cs
index 3a430cb6..f3fc0712 100644
--- a/BMA.EHR.OrganizationEmployee.Service/Program.cs
+++ b/BMA.EHR.OrganizationEmployee.Service/Program.cs
@@ -113,7 +113,7 @@ var app = builder.Build();
 
     
     app.UseHttpsRedirection();
-    app.UseMiddleware<ErrorHandlerMiddleware>();
+    app.UseMiddleware<CombinedErrorHandlerAndLoggingMiddleware>();
     app.UseCors();
     app.UseAuthentication();
     app.UseAuthorization();
diff --git a/BMA.EHR.Placement.Service/Program.cs b/BMA.EHR.Placement.Service/Program.cs
index 6ba63a4e..f954f343 100644
--- a/BMA.EHR.Placement.Service/Program.cs
+++ b/BMA.EHR.Placement.Service/Program.cs
@@ -147,13 +147,14 @@ var app = builder.Build();
 
     app.UseHttpsRedirection();
     app.UseCors();
+    app.UseMiddleware<CombinedErrorHandlerAndLoggingMiddleware>();
     app.UseAuthentication();
     app.UseAuthorization();
     app.UseDefaultFiles();
     app.UseStaticFiles();
     app.MapControllers();
-    app.UseMiddleware<ErrorHandlerMiddleware>();
-    app.UseMiddleware<RequestLoggingMiddleware>();
+    // app.UseMiddleware<ErrorHandlerMiddleware>();
+    // app.UseMiddleware<RequestLoggingMiddleware>();
 
     app.UseHangfireDashboard("/hangfire", new DashboardOptions()
     {
diff --git a/BMA.EHR.Report.Service/Program.cs b/BMA.EHR.Report.Service/Program.cs
index 319db2e4..b9066822 100644
--- a/BMA.EHR.Report.Service/Program.cs
+++ b/BMA.EHR.Report.Service/Program.cs
@@ -123,12 +123,13 @@ var app = builder.Build();
 
     app.UseHttpsRedirection();
     app.UseCors();
+    app.UseMiddleware<CombinedErrorHandlerAndLoggingMiddleware>();
     app.UseAuthentication();
     app.UseAuthorization();
     app.UseDefaultFiles();
     app.UseStaticFiles();
     app.MapControllers();
-    app.UseMiddleware<ErrorHandlerMiddleware>();
+    //app.UseMiddleware<ErrorHandlerMiddleware>();
 
     // apply migrations
     await using var scope = app.Services.CreateAsyncScope();
diff --git a/BMA.EHR.Retirement.Service/Program.cs b/BMA.EHR.Retirement.Service/Program.cs
index f8cf5bf8..ee807e0a 100644
--- a/BMA.EHR.Retirement.Service/Program.cs
+++ b/BMA.EHR.Retirement.Service/Program.cs
@@ -155,13 +155,14 @@ var app = builder.Build();
 
     app.UseHttpsRedirection();
     app.UseCors();
+    app.UseMiddleware<CombinedErrorHandlerAndLoggingMiddleware>();
     app.UseAuthentication();
     app.UseAuthorization();
     app.UseDefaultFiles();
     app.UseStaticFiles();
     app.MapControllers();
-    app.UseMiddleware<ErrorHandlerMiddleware>();
-    app.UseMiddleware<RequestLoggingMiddleware>();
+    // app.UseMiddleware<ErrorHandlerMiddleware>();
+    // app.UseMiddleware<RequestLoggingMiddleware>();
 
     app.UseHangfireDashboard("/hangfire", new DashboardOptions()
     {