diff --git a/apps/angular/yarn.lock b/apps/angular/yarn.lock
index d289c1f0..157384f1 100644
--- a/apps/angular/yarn.lock
+++ b/apps/angular/yarn.lock
@@ -7289,6 +7289,11 @@ postcss@^8.2.15, postcss@^8.2.4, postcss@^8.3.5, postcss@^8.3.7:
     picocolors "^1.0.0"
     source-map-js "^1.0.1"
 
+prettier@^2.6.0:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.6.2.tgz#e26d71a18a74c3d0f0597f55f01fb6c06c206032"
+  integrity sha512-PkUpF+qoXTqhOeWL9fu7As8LXsIUZ1WYaJiY/a7McAQzxjk82OF0tibkFXVCDImZtWxbvojFjerkiLb0/q8mew==
+
 pretty-bytes@^5.3.0:
   version "5.6.0"
   resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.6.0.tgz#356256f643804773c82f64723fe78c92c62beaeb"
diff --git a/etc/k8s/deploy-staging.ps1 b/etc/k8s/deploy-staging.ps1
index 3b3b8f97..342aab96 100644
--- a/etc/k8s/deploy-staging.ps1
+++ b/etc/k8s/deploy-staging.ps1
@@ -1 +1 @@
-helm upgrade --install es-st eshoponabp --namespace eshop --create-namespace
\ No newline at end of file
+helm upgrade --install eshop-st eshoponabp --namespace eshop --create-namespace
\ No newline at end of file
diff --git a/etc/k8s/eshoponabp/charts/administration/values.yaml b/etc/k8s/eshoponabp/charts/administration/values.yaml
index 05e9d62c..6ab15608 100644
--- a/etc/k8s/eshoponabp/charts/administration/values.yaml
+++ b/etc/k8s/eshoponabp/charts/administration/values.yaml
@@ -12,8 +12,8 @@ config:
     abpIdentityBaseUrl: #
     useCurrentToken: "false"
   dotnetEnv: Staging
-  redisHost: es-st-redis
-  rabbitmqHost: es-st-rabbitmq
+  redisHost: eshop-st-redis
+  rabbitmqHost: eshop-st-rabbitmq
   elasticsearchHost: #
   stringEncryptionDefaultPassPhrase: gsKnGZ041HLL4IM8
 
diff --git a/etc/k8s/eshoponabp/charts/basket/values.yaml b/etc/k8s/eshoponabp/charts/basket/values.yaml
index c69ad16a..88c5fb4c 100644
--- a/etc/k8s/eshoponabp/charts/basket/values.yaml
+++ b/etc/k8s/eshoponabp/charts/basket/values.yaml
@@ -9,9 +9,9 @@ config:
     swaggerClientId: "WebGateway_Swagger"
     swaggerClientSecret: "1q2w3e*"
   dotnetEnv: Staging
-  redisHost: es-st-redis
-  rabbitmqHost: es-st-rabbitmq
-  elasticsearchHost: es-st-elasticsearch
+  redisHost: eshop-st-redis
+  rabbitmqHost: eshop-st-rabbitmq
+  elasticsearchHost: eshop-st-elasticsearch
   stringEncryptionDefaultPassPhrase: gsKnGZ041HLL4IM8
   remoteServices:
     catalogBaseUrl: #
diff --git a/etc/k8s/eshoponabp/charts/catalog/values.yaml b/etc/k8s/eshoponabp/charts/catalog/values.yaml
index 8e65d499..9c72c62a 100644
--- a/etc/k8s/eshoponabp/charts/catalog/values.yaml
+++ b/etc/k8s/eshoponabp/charts/catalog/values.yaml
@@ -10,9 +10,9 @@ config:
     swaggerClientId: WebGateway_Swagger
     swaggerClientSecret: "1q2w3e*"
   dotnetEnv: Staging
-  redisHost: es-st-redis
-  rabbitmqHost: es-st-rabbitmq
-  elasticsearchHost: es-st-elasticsearch
+  redisHost: eshop-st-redis
+  rabbitmqHost: eshop-st-rabbitmq
+  elasticsearchHost: eshop-st-elasticsearch
   stringEncryptionDefaultPassPhrase: gsKnGZ041HLL4IM8
   grpcPort: 81
   kestrel:
diff --git a/etc/k8s/eshoponabp/charts/gateway-web-public/values.yaml b/etc/k8s/eshoponabp/charts/gateway-web-public/values.yaml
index 1b30388b..add78ef3 100644
--- a/etc/k8s/eshoponabp/charts/gateway-web-public/values.yaml
+++ b/etc/k8s/eshoponabp/charts/gateway-web-public/values.yaml
@@ -6,9 +6,9 @@ config:
     swaggerClientId: WebGateway_Swagger
     swaggerClientSecret: "1q2w3e*"
   dotnetEnv: Staging 
-  redisHost: es-st-redis
-  rabbitmqHost: es-st-rabbitmq
-  elasticsearchHost: es-st-elasticsearch
+  redisHost: eshop-st-redis
+  rabbitmqHost: eshop-st-rabbitmq
+  elasticsearchHost: eshop-st-elasticsearch
 
 reRoutes:
   accountService:
diff --git a/etc/k8s/eshoponabp/charts/identity/values.yaml b/etc/k8s/eshoponabp/charts/identity/values.yaml
index 34324d0b..22fdc06e 100644
--- a/etc/k8s/eshoponabp/charts/identity/values.yaml
+++ b/etc/k8s/eshoponabp/charts/identity/values.yaml
@@ -10,9 +10,9 @@ config:
     swaggerClientId: WebGateway_Swagger
     swaggerClientSecret: "1q2w3e*"
   dotnetEnv: Staging
-  redisHost: es-st-redis
-  rabbitmqHost: es-st-rabbitmq
-  elasticsearchHost: es-st-elasticsearch
+  redisHost: eshop-st-redis
+  rabbitmqHost: eshop-st-rabbitmq
+  elasticsearchHost: eshop-st-elasticsearch
   stringEncryptionDefaultPassPhrase: gsKnGZ041HLL4IM8
 
 # Seeded clients 
diff --git a/etc/k8s/eshoponabp/charts/ordering/values.yaml b/etc/k8s/eshoponabp/charts/ordering/values.yaml
index c9f8a55b..a427d0cf 100644
--- a/etc/k8s/eshoponabp/charts/ordering/values.yaml
+++ b/etc/k8s/eshoponabp/charts/ordering/values.yaml
@@ -10,9 +10,9 @@ config:
     swaggerClientId: WebGateway_Swagger
     swaggerClientSecret: "1q2w3e*"
   dotnetEnv: Staging
-  redisHost: es-st-redis
-  rabbitmqHost: es-st-rabbitmq
-  elasticsearchHost: es-st-elasticsearch
+  redisHost: eshop-st-redis
+  rabbitmqHost: eshop-st-rabbitmq
+  elasticsearchHost: eshop-st-elasticsearch
   stringEncryptionDefaultPassPhrase: gsKnGZ041HLL4IM8
 
 ingress:
diff --git a/etc/k8s/eshoponabp/charts/payment/values.yaml b/etc/k8s/eshoponabp/charts/payment/values.yaml
index 37ffd9cb..d641f59b 100644
--- a/etc/k8s/eshoponabp/charts/payment/values.yaml
+++ b/etc/k8s/eshoponabp/charts/payment/values.yaml
@@ -10,9 +10,9 @@ config:
     swaggerClientId: WebGateway_Swagger
     swaggerClientSecret: "1q2w3e*"
   dotnetEnv: Staging
-  redisHost: es-st-redis
-  rabbitmqHost: es-st-rabbitmq
-  elasticsearchHost: es-st-elasticsearch
+  redisHost: eshop-st-redis
+  rabbitmqHost: eshop-st-rabbitmq
+  elasticsearchHost: eshop-st-elasticsearch
   stringEncryptionDefaultPassPhrase: gsKnGZ041HLL4IM8
 
 ingress:
diff --git a/etc/k8s/eshoponabp/charts/public-web/values.yaml b/etc/k8s/eshoponabp/charts/public-web/values.yaml
index 7d38cb1f..390281e2 100644
--- a/etc/k8s/eshoponabp/charts/public-web/values.yaml
+++ b/etc/k8s/eshoponabp/charts/public-web/values.yaml
@@ -5,9 +5,9 @@ config:
     authority: http://eshop-st-authserver
     requireHttpsMetadata: "false"
   dotnetEnv: Staging
-  redisHost: es-st-redis
-  rabbitmqHost: es-st-rabbitmq
-  elasticsearchHost: es-st-elasticsearch
+  redisHost: eshop-st-redis
+  rabbitmqHost: eshop-st-rabbitmq
+  elasticsearchHost: eshop-st-elasticsearch
   stringEncryptionDefaultPassPhrase: gsKnGZ041HLL4IM8
 
 ingress:
diff --git a/etc/k8s/eshoponabp/values.yaml b/etc/k8s/eshoponabp/values.yaml
index 6e31550c..2b85511a 100644
--- a/etc/k8s/eshoponabp/values.yaml
+++ b/etc/k8s/eshoponabp/values.yaml
@@ -5,12 +5,12 @@ authserver:
     corsOrigins: https://eshop-st-gateway-web,https://eshop-st-gateway-web-public,https://eshop-st-identity,https://eshop-st-administration,https://eshop-st-basket,https://eshop-st-catalog,https://eshop-st-ordering,https://eshop-st-payment
     allowedRedirectUrls: https://eshop-st-web
     connectionStrings:
-      administrationService: "Host=es-st-postgresdb;Port=5432;Database=EShopOnAbp_Administration;User ID=postgres;password=myPassw0rd;Pooling=false"
-      identityService: "Host=es-st-postgresdb;Port=5432;Database=EShopOnAbp_Identity;User ID=postgres;password=myPassw0rd;Pooling=false"
+      administrationService: "Host=eshop-st-postgresdb;Port=5432;Database=EShopOnAbp_Administration;User ID=postgres;password=myPassw0rd;Pooling=false"
+      identityService: "Host=eshop-st-postgresdb;Port=5432;Database=EShopOnAbp_Identity;User ID=postgres;password=myPassw0rd;Pooling=false"
     dotnetEnv: Staging
-    redisHost: es-st-redis
-    rabbitmqHost: es-st-rabbitmq
-    elasticsearchHost: es-st-elasticsearch
+    redisHost: eshop-st-redis
+    rabbitmqHost: eshop-st-rabbitmq
+    elasticsearchHost: eshop-st-elasticsearch
   ingress:
     host: eshop-st-authserver
     tlsSecret: eshop-wildcard-tls
@@ -38,9 +38,9 @@ public-web:
       authority: http://eshop-st-authserver
       requireHttpsMetadata: "false"
     dotnetEnv: Staging
-    redisHost: es-st-redis
-    rabbitmqHost: es-st-rabbitmq
-    elasticsearchHost: es-st-elasticsearch
+    redisHost: eshop-st-redis
+    rabbitmqHost: eshop-st-rabbitmq
+    elasticsearchHost: eshop-st-elasticsearch
   ingress:
     host: eshop-st-public-web
   image:
@@ -53,17 +53,17 @@ identity:
     selfUrl: https://eshop-st-identity
     corsOrigins: https://eshop-st-gateway-web,https://eshop-st-gateway-web-public
     connectionStrings:
-      identityService: "Host=es-st-postgresdb;Port=5432;Database=EShopOnAbp_Identity;User ID=postgres;password=myPassw0rd;Pooling=false"
-      administrationService: "Host=es-st-postgresdb;Port=5432;Database=EShopOnAbp_Administration;User ID=postgres;password=myPassw0rd;Pooling=false"
+      identityService: "Host=eshop-st-postgresdb;Port=5432;Database=EShopOnAbp_Identity;User ID=postgres;password=myPassw0rd;Pooling=false"
+      administrationService: "Host=eshop-st-postgresdb;Port=5432;Database=EShopOnAbp_Administration;User ID=postgres;password=myPassw0rd;Pooling=false"
     authServer:
       authority: http://eshop-st-authserver
       requireHttpsMetadata: "false"
       swaggerClientId: WebGateway_Swagger
       swaggerClientSecret: "1q2w3e*"
     dotnetEnv: Staging
-    redisHost: es-st-redis
-    rabbitmqHost: es-st-rabbitmq
-    elasticsearchHost: es-st-elasticsearch    
+    redisHost: eshop-st-redis
+    rabbitmqHost: eshop-st-rabbitmq
+    elasticsearchHost: eshop-st-elasticsearch    
   identityServerClients: # Seeded Clients
     webRootUrl: https://eshop-st-web/  
     publicWebRootUrl: https://eshop-st-public-web/
@@ -88,7 +88,7 @@ administration:
     selfUrl: https://eshop-st-administration
     corsOrigins: https://eshop-st-gateway-web,https://eshop-st-gateway-web-public,https://eshop-st-gateway-internal
     connectionStrings:
-      administrationService: "Host=es-st-postgresdb;Port=5432;Database=EShopOnAbp_Administration;User ID=postgres;password=myPassw0rd;Pooling=false"
+      administrationService: "Host=eshop-st-postgresdb;Port=5432;Database=EShopOnAbp_Administration;User ID=postgres;password=myPassw0rd;Pooling=false"
     authServer:
       authority: http://eshop-st-authserver
       requireHttpsMetadata: "false"
@@ -98,9 +98,9 @@ administration:
       abpIdentityBaseUrl: https://eshop-st-identity
       useCurrentToken: "false"  
     dotnetEnv: Staging
-    redisHost: es-st-redis
-    rabbitmqHost: es-st-rabbitmq
-    elasticsearchHost: es-st-elasticsearch
+    redisHost: eshop-st-redis
+    rabbitmqHost: eshop-st-rabbitmq
+    elasticsearchHost: eshop-st-elasticsearch
   synchedCommunication: # Used for server-to-server (client-credentials) communication with identityService for user permissions
     authority: https://eshop-st-authserver
   ingress:
@@ -121,9 +121,9 @@ gateway-web:
       swaggerClientId: WebGateway_Swagger
       swaggerClientSecret: "1q2w3e*"
     dotnetEnv: Staging
-    redisHost: es-st-redis
-    rabbitmqHost: es-st-rabbitmq
-    elasticsearchHost: es-st-elasticsearch
+    redisHost: eshop-st-redis
+    rabbitmqHost: eshop-st-rabbitmq
+    elasticsearchHost: eshop-st-elasticsearch
   ingress:
     host: eshop-st-gateway-web
   image:
@@ -147,9 +147,9 @@ gateway-web-public:
       swaggerClientId: WebGateway_Swagger
       swaggerClientSecret: "1q2w3e*"
     dotnetEnv: Staging
-    redisHost: es-st-redis
-    rabbitmqHost: es-st-rabbitmq
-    elasticsearchHost: es-st-elasticsearch
+    redisHost: eshop-st-redis
+    rabbitmqHost: eshop-st-rabbitmq
+    elasticsearchHost: eshop-st-elasticsearch
   ingress:
     host: eshop-st-gateway-web-public
   image:
@@ -177,16 +177,16 @@ basket:
     selfUrl: https://eshop-st-basket
     corsOrigins: https://eshop-st-gateway-web,https://eshop-st-gateway-web-public,https://eshop-st-public-web
     connectionStrings:
-      administrationService: "Host=es-st-postgresdb;Port=5432;Database=EShopOnAbp_Administration;User ID=postgres;password=myPassw0rd;Pooling=false"
+      administrationService: "Host=eshop-st-postgresdb;Port=5432;Database=EShopOnAbp_Administration;User ID=postgres;password=myPassw0rd;Pooling=false"
     authServer:
       authority: http://eshop-st-authserver
       requireHttpsMetadata: "false"
       swaggerClientId: WebGateway_Swagger
       swaggerClientSecret: "1q2w3e*"
     dotnetEnv: Staging
-    redisHost: es-st-redis
-    rabbitmqHost: es-st-rabbitmq
-    elasticsearchHost: es-st-elasticsearch
+    redisHost: eshop-st-redis
+    rabbitmqHost: eshop-st-rabbitmq
+    elasticsearchHost: eshop-st-elasticsearch
     remoteServices:
       catalogBaseUrl: http://eshop-st-catalog
       catalogGrpcUrl: http://eshop-st-catalog
@@ -202,17 +202,17 @@ catalog:
     selfUrl: https://eshop-st-catalog
     corsOrigins: https://eshop-st-gateway-web,https://eshop-st-gateway-web-public,https://eshop-st-public-web,https://eshop-st-web
     connectionStrings:
-      catalogService: "mongodb://es-st-mongodb/EShopOnAbp_Catalog"
-      administrationService: "Host=es-st-postgresdb;Port=5432;Database=EShopOnAbp_Administration;User ID=postgres;password=myPassw0rd;Pooling=false"
+      catalogService: "mongodb://eshop-st-mongodb/EShopOnAbp_Catalog"
+      administrationService: "Host=eshop-st-postgresdb;Port=5432;Database=EShopOnAbp_Administration;User ID=postgres;password=myPassw0rd;Pooling=false"
     authServer:
       authority: http://eshop-st-authserver
       requireHttpsMetadata: "false"
       swaggerClientId: WebGateway_Swagger
       swaggerClientSecret: "1q2w3e*"
     dotnetEnv: Staging
-    redisHost: es-st-redis
-    rabbitmqHost: es-st-rabbitmq
-    elasticsearchHost: es-st-elasticsearch
+    redisHost: eshop-st-redis
+    rabbitmqHost: eshop-st-rabbitmq
+    elasticsearchHost: eshop-st-elasticsearch
     kestrel:
       httpUrl: http://eshop-st-catalog:80
       httpProtocols: Http1AndHttp2
@@ -230,17 +230,17 @@ ordering:
     selfUrl: https://eshop-st-ordering
     corsOrigins: https://eshop-st-gateway-web,https://eshop-st-gateway-web-public
     connectionStrings:
-      orderingService: "Host=es-st-postgresdb;Port=5432;Database=EShopOnAbp_Ordering;User ID=postgres;password=myPassw0rd;Pooling=false"
-      administrationService: "Host=es-st-postgresdb;Port=5432;Database=EShopOnAbp_Administration;User ID=postgres;password=myPassw0rd;Pooling=false"
+      orderingService: "Host=eshop-st-postgresdb;Port=5432;Database=EShopOnAbp_Ordering;User ID=postgres;password=myPassw0rd;Pooling=false"
+      administrationService: "Host=eshop-st-postgresdb;Port=5432;Database=EShopOnAbp_Administration;User ID=postgres;password=myPassw0rd;Pooling=false"
     authServer:
       authority: http://eshop-st-authserver
       requireHttpsMetadata: "false"
       swaggerClientId: WebGateway_Swagger
       swaggerClientSecret: "1q2w3e*"
     dotnetEnv: Staging
-    redisHost: es-st-redis
-    rabbitmqHost: es-st-rabbitmq
-    elasticsearchHost: es-st-elasticsearch
+    redisHost: eshop-st-redis
+    rabbitmqHost: eshop-st-rabbitmq
+    elasticsearchHost: eshop-st-elasticsearch
   ingress:
     host: eshop-st-ordering
   image:
@@ -253,17 +253,17 @@ payment:
     selfUrl: https://eshop-st-payment
     corsOrigins: https://eshop-st-gateway-web,https://eshop-st-gateway-web-public
     connectionStrings:
-      paymentService: "Host=es-st-postgresdb;Port=5432;Database=EShopOnAbp_Payment;User ID=postgres;password=myPassw0rd;Pooling=false"
-      administrationService: "Host=es-st-postgresdb;Port=5432;Database=EShopOnAbp_Administration;User ID=postgres;password=myPassw0rd;Pooling=false"
+      paymentService: "Host=eshop-st-postgresdb;Port=5432;Database=EShopOnAbp_Payment;User ID=postgres;password=myPassw0rd;Pooling=false"
+      administrationService: "Host=eshop-st-postgresdb;Port=5432;Database=EShopOnAbp_Administration;User ID=postgres;password=myPassw0rd;Pooling=false"
     authServer:
       authority: http://eshop-st-authserver
       requireHttpsMetadata: "false"
       swaggerClientId: WebGateway_Swagger
       swaggerClientSecret: "1q2w3e*"
     dotnetEnv: Staging
-    redisHost: es-st-redis
-    rabbitmqHost: es-st-rabbitmq
-    elasticsearchHost: es-st-elasticsearch
+    redisHost: eshop-st-redis
+    rabbitmqHost: eshop-st-rabbitmq
+    elasticsearchHost: eshop-st-elasticsearch
   ingress:
     host: eshop-st-payment
   image:
diff --git a/gateways/web-public/src/EShopOnAbp.WebPublicGateway/EShopOnAbpWebPublicGatewayModule.cs b/gateways/web-public/src/EShopOnAbp.WebPublicGateway/EShopOnAbpWebPublicGatewayModule.cs
index 6609c638..d99b84ab 100644
--- a/gateways/web-public/src/EShopOnAbp.WebPublicGateway/EShopOnAbpWebPublicGatewayModule.cs
+++ b/gateways/web-public/src/EShopOnAbp.WebPublicGateway/EShopOnAbpWebPublicGatewayModule.cs
@@ -53,7 +53,7 @@ public class EShopOnAbpWebPublicGatewayModule : AbpModule
 
         app.UseCorrelationId();
         app.UseAbpSerilogEnrichers();
-        app.ConfigureSwaggerUIWithYarp(context);
+        app.UseSwaggerUIWithYarp(context);
         
         app.UseRewriter(new RewriteOptions()
             // Regex for "", "/" and "" (whitespace)
diff --git a/gateways/web/src/EShopOnAbp.WebGateway/EShopOnAbpWebGatewayModule.cs b/gateways/web/src/EShopOnAbp.WebGateway/EShopOnAbpWebGatewayModule.cs
index 95068c38..d92c0572 100644
--- a/gateways/web/src/EShopOnAbp.WebGateway/EShopOnAbpWebGatewayModule.cs
+++ b/gateways/web/src/EShopOnAbp.WebGateway/EShopOnAbpWebGatewayModule.cs
@@ -73,7 +73,7 @@ public class EShopOnAbpWebGatewayModule : AbpModule
         app.UseCorrelationId();
         app.UseAbpSerilogEnrichers();
         app.UseCors();
-        app.ConfigureSwaggerUIWithYarp(context);
+        app.UseSwaggerUIWithYarp(context);
 
         app.UseRewriter(new RewriteOptions()
             // Regex for "", "/" and "" (whitespace)
diff --git a/shared/EShopOnAbp.Shared.Hosting.Gateways/YarpSwaggerUIBuilderExtensions.cs b/shared/EShopOnAbp.Shared.Hosting.Gateways/YarpSwaggerUIBuilderExtensions.cs
index 7a8cb5e0..508884a6 100644
--- a/shared/EShopOnAbp.Shared.Hosting.Gateways/YarpSwaggerUIBuilderExtensions.cs
+++ b/shared/EShopOnAbp.Shared.Hosting.Gateways/YarpSwaggerUIBuilderExtensions.cs
@@ -10,7 +10,7 @@ namespace EShopOnAbp.Shared.Hosting.Gateways;
 
 public static class YarpSwaggerUIBuilderExtensions
 {
-    public static IApplicationBuilder ConfigureSwaggerUIWithYarp(this IApplicationBuilder app,
+    public static IApplicationBuilder UseSwaggerUIWithYarp(this IApplicationBuilder app,
         ApplicationInitializationContext context)
     {
         app.UseSwagger();