diff --git a/src/Services/Basket/Basket.API/Program.cs b/src/Services/Basket/Basket.API/Program.cs
index 0844d32b3..7bdc8709f 100644
--- a/src/Services/Basket/Basket.API/Program.cs
+++ b/src/Services/Basket/Basket.API/Program.cs
@@ -2,9 +2,7 @@
 
 var builder = WebApplication.CreateBuilder(args);
 
-builder.Configuration.AddKeyVault();
-
-builder.Services.AddApplicationInsights(builder.Configuration);
+builder.AddServiceDefaults();
 
 builder.Services.AddGrpc(options =>
 {
@@ -17,24 +15,12 @@ builder.Services.AddControllers(options =>
     options.Filters.Add(typeof(ValidateModelStateFilter));
 });
 
-builder.Services.AddDefaultOpenApi(builder.Configuration);
-
-builder.Services.AddDefaultAuthentication(builder.Configuration);
-
-builder.Services.AddDefaultHealthChecks(builder.Configuration);
-
-builder.Host.UseDefaultSerilog(builder.Configuration, AppName);
-
-builder.WebHost.UseDefaultPorts(builder.Configuration);
-
 builder.WebHost.UseFailing(options =>
 {
     options.ConfigPath = "/Failing";
     options.NotFilteredPaths.AddRange(new[] { "/hc", "/liveness" });
 });
 
-builder.Services.AddEventBus(builder.Configuration);
-
 builder.Services.Configure<BasketSettings>(builder.Configuration);
 
 builder.Services.AddRedis();
@@ -49,24 +35,11 @@ var app = builder.Build();
 
 app.MapGet("hello", () => "hello");
 
-if (!app.Environment.IsDevelopment())
-{
-    app.UseExceptionHandler("/Home/Error");
-}
-
-var pathBase = app.Configuration["PATH_BASE"];
-if (!string.IsNullOrEmpty(pathBase))
-{
-    app.UsePathBase(pathBase);
-}
-
-app.UseDefaultOpenApi(builder.Configuration);
+app.UseServiceDefaults();
 
 app.MapGrpcService<BasketService>();
 app.MapControllers();
 
-app.MapDefaultHealthChecks();
-
 var eventBus = app.Services.GetRequiredService<IEventBus>();
 
 eventBus.Subscribe<ProductPriceChangedIntegrationEvent, ProductPriceChangedIntegrationEventHandler>();
diff --git a/src/Services/Services.Common/CommonExtensions.cs b/src/Services/Services.Common/CommonExtensions.cs
index 31610ac95..770d2b41f 100644
--- a/src/Services/Services.Common/CommonExtensions.cs
+++ b/src/Services/Services.Common/CommonExtensions.cs
@@ -58,6 +58,11 @@ public static class CommonExtensions
 
     public static WebApplication UseServiceDefaults(this WebApplication app)
     {
+        if (!app.Environment.IsDevelopment())
+        {
+            app.UseExceptionHandler("/Home/Error");
+        }
+
         var pathBase = app.Configuration["PATH_BASE"];
 
         if (!string.IsNullOrEmpty(pathBase))