diff --git a/src/Services/Basket/Basket.API/Program.cs b/src/Services/Basket/Basket.API/Program.cs
index 6b7387c55..3b460d586 100644
--- a/src/Services/Basket/Basket.API/Program.cs
+++ b/src/Services/Basket/Basket.API/Program.cs
@@ -12,7 +12,8 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API
 {
     public class Program
     {
-        private static readonly string ApplicationName = typeof(Program).Namespace;
+        public static readonly string AppName = typeof(Program).Namespace;
+        public static readonly string ShortAppName = AppName.Substring(AppName.LastIndexOf('.', AppName.LastIndexOf('.') - 1) + 1);
 
         public static int Main(string[] args)
         {
@@ -22,17 +23,17 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API
 
             try
             {
-                Log.Information("Configuring web host ({Application})...", ApplicationName);
+                Log.Information("Configuring web host ({Application})...", AppName);
                 var host = BuildWebHost(configuration, args);
 
-                Log.Information("Starting web host ({Application})...", ApplicationName);
+                Log.Information("Starting web host ({Application})...", AppName);
                 host.Run();
 
                 return 0;
             }
             catch (Exception ex)
             {
-                Log.Fatal(ex, "Program terminated unexpectedly ({Application})!", ApplicationName);
+                Log.Fatal(ex, "Program terminated unexpectedly ({Application})!", AppName);
                 return 1;
             }
             finally
@@ -59,7 +60,7 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API
 
             return new LoggerConfiguration()
                 .MinimumLevel.Verbose()
-                .Enrich.WithProperty("Application", ApplicationName)
+                .Enrich.WithProperty("Application", AppName)
                 .Enrich.FromLogContext()
                 .WriteTo.Console()
                 .WriteTo.Seq(string.IsNullOrWhiteSpace(seqServerUrl) ? "http://seq" : seqServerUrl)
diff --git a/src/Services/Basket/Basket.API/Startup.cs b/src/Services/Basket/Basket.API/Startup.cs
index 9ae6822f8..4dc01098c 100644
--- a/src/Services/Basket/Basket.API/Startup.cs
+++ b/src/Services/Basket/Basket.API/Startup.cs
@@ -181,8 +181,8 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
         public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory)
         {
-            loggerFactory.AddAzureWebAppDiagnostics();
-            loggerFactory.AddApplicationInsights(app.ApplicationServices, LogLevel.Trace);
+            //loggerFactory.AddAzureWebAppDiagnostics();
+            //loggerFactory.AddApplicationInsights(app.ApplicationServices, LogLevel.Trace);
 
             var pathBase = Configuration["PATH_BASE"];
             if (!string.IsNullOrEmpty(pathBase))
diff --git a/src/Services/Catalog/Catalog.API/Program.cs b/src/Services/Catalog/Catalog.API/Program.cs
index 4f05f4b74..04455585c 100644
--- a/src/Services/Catalog/Catalog.API/Program.cs
+++ b/src/Services/Catalog/Catalog.API/Program.cs
@@ -14,7 +14,8 @@ namespace Microsoft.eShopOnContainers.Services.Catalog.API
 {
     public class Program
     {
-        private static readonly string ApplicationName = typeof(Program).Namespace;
+        public static readonly string AppName = typeof(Program).Namespace;
+        public static readonly string ShortAppName = AppName.Substring(AppName.LastIndexOf('.', AppName.LastIndexOf('.') - 1) + 1);
 
         public static int Main(string[] args)
         {
@@ -24,10 +25,10 @@ namespace Microsoft.eShopOnContainers.Services.Catalog.API
 
             try
             {
-                Log.Information("Configuring web host ({Application})...", ApplicationName);
+                Log.Information("Configuring web host ({Application})...", AppName);
                 var host = BuildWebHost(configuration, args);
 
-                Log.Information("Applying migrations ({Application})...", ApplicationName);
+                Log.Information("Applying migrations ({Application})...", AppName);
                 host.MigrateDbContext<CatalogContext>((context, services) =>
                 {
                     var env = services.GetService<IHostingEnvironment>();
@@ -35,19 +36,19 @@ namespace Microsoft.eShopOnContainers.Services.Catalog.API
                     var logger = services.GetService<ILogger<CatalogContextSeed>>();
 
                     new CatalogContextSeed()
-                    .SeedAsync(context, env, settings, logger)
-                    .Wait();
+                        .SeedAsync(context, env, settings, logger)
+                        .Wait();
                 })
                 .MigrateDbContext<IntegrationEventLogContext>((_, __) => { });
 
-                Log.Information("Starting web host ({Application})...", ApplicationName);
+                Log.Information("Starting web host ({Application})...", AppName);
                 host.Run();
 
                 return 0;
             }
             catch (Exception ex)
             {
-                Log.Fatal(ex, "Program terminated unexpectedly ({Application})!", ApplicationName);
+                Log.Fatal(ex, "Program terminated unexpectedly ({Application})!", AppName);
                 return 1;
             }
             finally
@@ -73,7 +74,7 @@ namespace Microsoft.eShopOnContainers.Services.Catalog.API
 
             return new LoggerConfiguration()
                 .MinimumLevel.Verbose()
-                .Enrich.WithProperty("Application", ApplicationName)
+                .Enrich.WithProperty("Application", AppName)
                 .Enrich.FromLogContext()
                 .WriteTo.Console()
                 .WriteTo.Seq(string.IsNullOrWhiteSpace(seqServerUrl) ? "http://seq" : seqServerUrl)
diff --git a/src/Services/Catalog/Catalog.API/Startup.cs b/src/Services/Catalog/Catalog.API/Startup.cs
index 5c77d37c8..990cd0f80 100644
--- a/src/Services/Catalog/Catalog.API/Startup.cs
+++ b/src/Services/Catalog/Catalog.API/Startup.cs
@@ -64,8 +64,8 @@ namespace Microsoft.eShopOnContainers.Services.Catalog.API
         {
             //Configure logs
 
-            loggerFactory.AddAzureWebAppDiagnostics();
-            loggerFactory.AddApplicationInsights(app.ApplicationServices, LogLevel.Trace);
+            //loggerFactory.AddAzureWebAppDiagnostics();
+            //loggerFactory.AddApplicationInsights(app.ApplicationServices, LogLevel.Trace);
 
             var pathBase = Configuration["PATH_BASE"];