diff --git a/src/Services/Basket/Basket.API/Startup.cs b/src/Services/Basket/Basket.API/Startup.cs
index cfe95dcc5..6e3171bf9 100644
--- a/src/Services/Basket/Basket.API/Startup.cs
+++ b/src/Services/Basket/Basket.API/Startup.cs
@@ -30,7 +30,7 @@ public class Startup
         services.AddSwaggerGen(options =>
         {            
             var basePath = AppDomain.CurrentDomain.BaseDirectory;
-            var fileName = typeof(Program).GetTypeInfo().Assembly.GetName().Name + ".xml";
+            var fileName = typeof(Startup).GetTypeInfo().Assembly.GetName().Name + ".xml";
             var xmlComments = Path.Combine(basePath, fileName);
             options.IncludeXmlComments(xmlComments);
             options.SwaggerDoc("v1", new OpenApiInfo
diff --git a/src/Services/Catalog/Catalog.API/Startup.cs b/src/Services/Catalog/Catalog.API/Startup.cs
index 39048cb61..0f0e75361 100644
--- a/src/Services/Catalog/Catalog.API/Startup.cs
+++ b/src/Services/Catalog/Catalog.API/Startup.cs
@@ -223,7 +223,7 @@ public static class CustomExtensionMethods
         services.AddSwaggerGen(options =>
         {            
             var basePath = AppDomain.CurrentDomain.BaseDirectory;
-            var fileName = typeof(Program).GetTypeInfo().Assembly.GetName().Name + ".xml";
+            var fileName = typeof(Startup).GetTypeInfo().Assembly.GetName().Name + ".xml";
             var xmlComments = Path.Combine(basePath, fileName);
             options.IncludeXmlComments(xmlComments);
             options.SwaggerDoc("v1", new OpenApiInfo
diff --git a/src/Services/Identity/Identity.API/Startup.cs b/src/Services/Identity/Identity.API/Startup.cs
index 2528d88a1..51b1d4f8e 100644
--- a/src/Services/Identity/Identity.API/Startup.cs
+++ b/src/Services/Identity/Identity.API/Startup.cs
@@ -90,7 +90,7 @@ namespace Microsoft.eShopOnContainers.Services.Identity.API
             services.AddRazorPages();
 
             var basePath = AppDomain.CurrentDomain.BaseDirectory;
-            var fileName = typeof(Program).GetTypeInfo().Assembly.GetName().Name + ".xml";
+            var fileName = typeof(Startup).GetTypeInfo().Assembly.GetName().Name + ".xml";
             var xmlComments = Path.Combine(basePath, fileName);
             options.IncludeXmlComments(xmlComments);
             options.SwaggerDoc("v1", new OpenApiInfo
diff --git a/src/Services/Ordering/Ordering.API/Startup.cs b/src/Services/Ordering/Ordering.API/Startup.cs
index c48b77d7e..b91ed3f8d 100644
--- a/src/Services/Ordering/Ordering.API/Startup.cs
+++ b/src/Services/Ordering/Ordering.API/Startup.cs
@@ -216,7 +216,7 @@ static class CustomExtensionsMethods
         services.AddSwaggerGen(options =>
         {          
             var basePath = AppDomain.CurrentDomain.BaseDirectory;
-            var fileName = typeof(Program).GetTypeInfo().Assembly.GetName().Name + ".xml";
+            var fileName = typeof(Startup).GetTypeInfo().Assembly.GetName().Name + ".xml";
             var xmlComments = Path.Combine(basePath, fileName);
             options.IncludeXmlComments(xmlComments);  
             options.SwaggerDoc("v1", new OpenApiInfo
diff --git a/src/Services/Webhooks/Webhooks.API/Startup.cs b/src/Services/Webhooks/Webhooks.API/Startup.cs
index 1d9359ffa..35ccf8f88 100644
--- a/src/Services/Webhooks/Webhooks.API/Startup.cs
+++ b/src/Services/Webhooks/Webhooks.API/Startup.cs
@@ -140,7 +140,7 @@ static class CustomExtensionMethods
         services.AddSwaggerGen(options =>
         {            
              var basePath = AppDomain.CurrentDomain.BaseDirectory;
-            var fileName = typeof(Program).GetTypeInfo().Assembly.GetName().Name + ".xml";
+            var fileName = typeof(Startup).GetTypeInfo().Assembly.GetName().Name + ".xml";
             var xmlComments = Path.Combine(basePath, fileName);
             options.IncludeXmlComments(xmlComments);
             options.SwaggerDoc("v1", new OpenApiInfo