diff --git a/etc/k8s/eshoponabp/charts/administration/templates/administration-deployment.yaml b/etc/k8s/eshoponabp/charts/administration/templates/administration-deployment.yaml
index 2b506bad..7ddc0fe4 100644
--- a/etc/k8s/eshoponabp/charts/administration/templates/administration-deployment.yaml
+++ b/etc/k8s/eshoponabp/charts/administration/templates/administration-deployment.yaml
@@ -23,8 +23,10 @@ spec:
         env:
         - name: App__SelfUrl
           value: "{{ .Values.config.selfUrl }}"
-        - name: RemoteServices__Default__BaseUrl
-          value: "{{ .Values.config.gatewayUrl }}"
+        - name: RemoteServices__AbpIdentity__BaseUrl
+          value: "{{ .Values.config.remoteServices.abpIdentityBaseUrl }}"
+        - name: RemoteServices__AbpIdentity__UseCurrentAccessToken
+          value: "{{ .Values.config.remoteServices.useCurrentToken }}"  
         - name: App__CorsOrigins
           value: "{{ .Values.config.corsOrigins }}"
         - name: IdentityClients__Default__Authority
@@ -39,6 +41,10 @@ spec:
           value: "{{ .Values.config.authServer.authority }}"
         - name: "AuthServer__RequireHttpsMetadata"
           value: "{{ .Values.config.authServer.requireHttpsMetadata }}"
+        - name: "AuthServer__SwaggerClientId"
+          value: "{{ .Values.config.authServer.swaggerClientId }}"
+        - name: "AuthServer__SwaggerClientSecret"
+          value: "{{ .Values.config.authServer.swaggerClientSecret }}"  
         - name: "StringEncryption__DefaultPassPhrase"
           value: "{{ .Values.config.stringEncryptionDefaultPassPhrase }}"
         - name: "RabbitMQ__Connections__Default__HostName"
diff --git a/etc/k8s/eshoponabp/charts/administration/values.yaml b/etc/k8s/eshoponabp/charts/administration/values.yaml
index 26aefe9d..5b0f6c97 100644
--- a/etc/k8s/eshoponabp/charts/administration/values.yaml
+++ b/etc/k8s/eshoponabp/charts/administration/values.yaml
@@ -1,12 +1,16 @@
 config:
   selfUrl: # https://eshop-st-administration
-  gatewayUrl: # https://eshop-st-gateway-internal/
   corsOrigins: # https://eshop-st-gateway-web,https://eshop-st-gateway-public-web,https://eshop-st-gateway-internal
   connectionStrings:
     administrationService: #
   authServer:
     authority: http://eshop-st-authserver
     requireHttpsMetadata: "false"
+    swaggerClientId: WebGateway_Swagger
+    swaggerClientSecret: "1q2w3e*"
+  remoteServices:
+    abpIdentityBaseUrl: #
+    useCurrentToken: "false"
   dotnetEnv: Staging
   redisHost: es-st-redis
   rabbitmqHost: es-st-rabbitmq
diff --git a/etc/k8s/eshoponabp/charts/authserver/templates/authserver-deployment.yaml b/etc/k8s/eshoponabp/charts/authserver/templates/authserver-deployment.yaml
index 3ac0b8fe..7db227d3 100644
--- a/etc/k8s/eshoponabp/charts/authserver/templates/authserver-deployment.yaml
+++ b/etc/k8s/eshoponabp/charts/authserver/templates/authserver-deployment.yaml
@@ -31,6 +31,14 @@ spec:
           value: "{{ .Values.config.connectionStrings.identityService }}"
         - name: "ConnectionStrings__AdministrationService"
           value: "{{ .Values.config.connectionStrings.administrationService }}"
+        - name: "AuthServer__Authority"
+          value: "{{ .Values.config.authServer.authority }}"
+        - name: "AuthServer__RequireHttpsMetadata"
+          value: "{{ .Values.config.authServer.requireHttpsMetadata }}"
+        - name: "AuthServer__SwaggerClientId"
+          value: "{{ .Values.config.authServer.swaggerClientId }}"
+        - name: "AuthServer__SwaggerClientSecret"
+          value: "{{ .Values.config.authServer.swaggerClientSecret }}"
         - name: "DOTNET_ENVIRONMENT"
           value: "{{ .Values.config.dotnetEnv }}"
         - name: "Redis__Configuration"
diff --git a/etc/k8s/eshoponabp/charts/authserver/values.yaml b/etc/k8s/eshoponabp/charts/authserver/values.yaml
index d80adc30..95f80979 100644
--- a/etc/k8s/eshoponabp/charts/authserver/values.yaml
+++ b/etc/k8s/eshoponabp/charts/authserver/values.yaml
@@ -4,7 +4,12 @@ config:
   allowedRedirectUrls: https://eshop-st-web
   connectionStrings:
     administrationService: #
-    identityService: # 
+    identityService: #
+  authServer:
+    authority: http://eshop-st-authserver
+    requireHttpsMetadata: "false"
+    swaggerClientId: WebGateway_Swagger
+    swaggerClientSecret: "1q2w3e*"  
   dotnetEnv: # 
   redisHost: #
   rabbitmqHost: #
diff --git a/etc/k8s/eshoponabp/charts/gateway-web-public/templates/gateway-web-public-configmap.yaml b/etc/k8s/eshoponabp/charts/gateway-web-public/templates/gateway-web-public-configmap.yaml
index 88f4794e..809ea92d 100644
--- a/etc/k8s/eshoponabp/charts/gateway-web-public/templates/gateway-web-public-configmap.yaml
+++ b/etc/k8s/eshoponabp/charts/gateway-web-public/templates/gateway-web-public-configmap.yaml
@@ -61,11 +61,11 @@ data:
     {
       "ServiceKey": "Ordering Service",
       "DownstreamPathTemplate": "/api/ordering/{everything}",
-      "DownstreamScheme": "{{ .Values.reRoutes.orderService.schema }}",
+      "DownstreamScheme": "{{ .Values.reRoutes.orderingService.schema }}",
       "DownstreamHostAndPorts": [
         {
-          "Host": "{{ .Values.reRoutes.orderService.host }}",
-          "Port": "{{ .Values.reRoutes.orderService.port }}",
+          "Host": "{{ .Values.reRoutes.orderingService.host }}",
+          "Port": "{{ .Values.reRoutes.orderingService.port }}",
         }
       ],
       "UpstreamPathTemplate": "/api/ordering/{everything}",
diff --git a/etc/k8s/eshoponabp/charts/gateway-web-public/templates/gateway-web-public-deployment.yaml b/etc/k8s/eshoponabp/charts/gateway-web-public/templates/gateway-web-public-deployment.yaml
index a64d660e..910a6606 100644
--- a/etc/k8s/eshoponabp/charts/gateway-web-public/templates/gateway-web-public-deployment.yaml
+++ b/etc/k8s/eshoponabp/charts/gateway-web-public/templates/gateway-web-public-deployment.yaml
@@ -38,7 +38,11 @@ spec:
         - name: "AuthServer__Authority"
           value: "{{ .Values.config.authServer.authority }}"
         - name: "AuthServer__RequireHttpsMetadata"
-          value: "{{ .Values.config.authServer.requireHttpsMetadata }}"        
+          value: "{{ .Values.config.authServer.requireHttpsMetadata }}"
+        - name: "AuthServer__SwaggerClientId"
+          value: "{{ .Values.config.authServer.swaggerClientId }}"
+        - name: "AuthServer__SwaggerClientSecret"
+          value: "{{ .Values.config.authServer.swaggerClientSecret }}"
         - name: "ElasticSearch__Url"
           value: "{{ .Values.config.elasticsearchHost }}"          
         - name: "StringEncryption__DefaultPassPhrase"
diff --git a/etc/k8s/eshoponabp/charts/gateway-web-public/values.yaml b/etc/k8s/eshoponabp/charts/gateway-web-public/values.yaml
index 321eeaca..002e5667 100644
--- a/etc/k8s/eshoponabp/charts/gateway-web-public/values.yaml
+++ b/etc/k8s/eshoponabp/charts/gateway-web-public/values.yaml
@@ -3,7 +3,9 @@ config:
   globalConfigurationBaseUrl: http://eshop-st-gateway-public-web
   authServer:
     authority: http://eshop-st-authserver
-    requireHttpsMetadata: "false"  
+    requireHttpsMetadata: "false"
+    swaggerClientId: WebGateway_Swagger
+    swaggerClientSecret: "1q2w3e*"
   dotnetEnv: Staging 
   redisHost: es-st-redis
   rabbitmqHost: es-st-rabbitmq
@@ -27,9 +29,9 @@ reRoutes:
     schema: http
     host: eshop-st-basket
     port: 80
-  orderService:
+  orderingService:
     schema: http
-    host: eshop-st-order
+    host: eshop-st-ordering
     port: 80     
 
 ingress:
diff --git a/etc/k8s/eshoponabp/charts/gateway-web/templates/gateway-web-deployment.yaml b/etc/k8s/eshoponabp/charts/gateway-web/templates/gateway-web-deployment.yaml
index 75e1f1a0..25b3f694 100644
--- a/etc/k8s/eshoponabp/charts/gateway-web/templates/gateway-web-deployment.yaml
+++ b/etc/k8s/eshoponabp/charts/gateway-web/templates/gateway-web-deployment.yaml
@@ -40,7 +40,11 @@ spec:
         - name: "AuthServer__Authority"
           value: "{{ .Values.config.authServer.authority }}"
         - name: "AuthServer__RequireHttpsMetadata"
-          value: "{{ .Values.config.authServer.requireHttpsMetadata }}"        
+          value: "{{ .Values.config.authServer.requireHttpsMetadata }}"
+        - name: "AuthServer__SwaggerClientId"
+          value: "{{ .Values.config.authServer.swaggerClientId }}"
+        - name: "AuthServer__SwaggerClientSecret"
+          value: "{{ .Values.config.authServer.swaggerClientSecret }}"  
         - name: "ElasticSearch__Url"
           value: "{{ .Values.config.elasticsearchHost }}"          
         - name: "StringEncryption__DefaultPassPhrase"
diff --git a/etc/k8s/eshoponabp/charts/gateway-web/values.yaml b/etc/k8s/eshoponabp/charts/gateway-web/values.yaml
index 40195ae2..a80b0b01 100644
--- a/etc/k8s/eshoponabp/charts/gateway-web/values.yaml
+++ b/etc/k8s/eshoponabp/charts/gateway-web/values.yaml
@@ -4,7 +4,9 @@ config:
   globalConfigurationBaseUrl: # http://eshop-st-gateway-web
   authServer:
     authority: http://eshop-st-authserver
-    requireHttpsMetadata: "false"  
+    requireHttpsMetadata: "false"
+    swaggerClientId: WebGateway_Swagger
+    swaggerClientSecret: "1q2w3e*"
   dotnetEnv: # 
   redisHost: #
   rabbitmqHost: #
diff --git a/etc/k8s/eshoponabp/charts/identity/templates/identity-deployment.yaml b/etc/k8s/eshoponabp/charts/identity/templates/identity-deployment.yaml
index e1e8d68c..b634a2e2 100644
--- a/etc/k8s/eshoponabp/charts/identity/templates/identity-deployment.yaml
+++ b/etc/k8s/eshoponabp/charts/identity/templates/identity-deployment.yaml
@@ -41,6 +41,10 @@ spec:
           value: "{{ .Values.config.authServer.authority }}"
         - name: "AuthServer__RequireHttpsMetadata"
           value: "{{ .Values.config.authServer.requireHttpsMetadata }}"
+        - name: "AuthServer__SwaggerClientId"
+          value: "{{ .Values.config.authServer.swaggerClientId }}"
+        - name: "AuthServer__SwaggerClientSecret"
+          value: "{{ .Values.config.authServer.swaggerClientSecret }}"  
         - name: "StringEncryption__DefaultPassPhrase"
           value: "{{ .Values.config.stringEncryptionDefaultPassPhrase }}"             
         - name: "IdentityServerClients__Web__RootUrl"
diff --git a/etc/k8s/eshoponabp/charts/identity/values.yaml b/etc/k8s/eshoponabp/charts/identity/values.yaml
index f31ac04b..f7f0faa7 100644
--- a/etc/k8s/eshoponabp/charts/identity/values.yaml
+++ b/etc/k8s/eshoponabp/charts/identity/values.yaml
@@ -7,6 +7,8 @@ config:
   authServer:
     authority: http://eshop-st-authserver
     requireHttpsMetadata: "false"
+    swaggerClientId: WebGateway_Swagger
+    swaggerClientSecret: "1q2w3e*"
   dotnetEnv: Staging
   redisHost: es-st-redis
   rabbitmqHost: es-st-rabbitmq
diff --git a/etc/k8s/eshoponabp/charts/payment/templates/payment-deployment.yaml b/etc/k8s/eshoponabp/charts/payment/templates/payment-deployment.yaml
index 78bcb82e..c3526b1b 100644
--- a/etc/k8s/eshoponabp/charts/payment/templates/payment-deployment.yaml
+++ b/etc/k8s/eshoponabp/charts/payment/templates/payment-deployment.yaml
@@ -25,8 +25,8 @@ spec:
           value: "{{ .Values.config.selfUrl }}"
         - name: App__CorsOrigins
           value: "{{ .Values.config.corsOrigins }}"
-        - name: "ConnectionStrings__OrderingService"
-          value: {{ .Values.config.connectionStrings.orderingService }}  
+        - name: "ConnectionStrings__PaymentService"
+          value: {{ .Values.config.connectionStrings.paymentService }}  
         - name: "ConnectionStrings__AdministrationService"
           value: {{ .Values.config.connectionStrings.administrationService }}
         - name: "DOTNET_ENVIRONMENT"
diff --git a/etc/k8s/eshoponabp/values.yaml b/etc/k8s/eshoponabp/values.yaml
index 28716c59..ab84ca38 100644
--- a/etc/k8s/eshoponabp/values.yaml
+++ b/etc/k8s/eshoponabp/values.yaml
@@ -2,13 +2,12 @@
 authserver:
   config:
     selfUrl: https://eshop-st-authserver    
-    corsOrigins: https://eshop-st-gateway-web,https://eshop-st-gateway-web-public,https://eshop-st-gateway-internal
+    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"
     dotnetEnv: Staging
-    globalizationInvariant: 0 #https://docs.microsoft.com/en-us/dotnet/core/runtime-config/globalization
     redisHost: es-st-redis
     rabbitmqHost: es-st-rabbitmq
     elasticsearchHost: es-st-elasticsearch
@@ -58,6 +57,8 @@ identity:
     authServer:
       authority: http://eshop-st-authserver
       requireHttpsMetadata: "false"
+      swaggerClientId: WebGateway_Swagger
+      swaggerClientSecret: "1q2w3e*"
     dotnetEnv: Staging
     redisHost: es-st-redis
     rabbitmqHost: es-st-rabbitmq
@@ -84,13 +85,17 @@ identity:
 administration:
   config:
     selfUrl: https://eshop-st-administration
-    gatewayUrl: https://eshop-st-gateway-internal/
     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"
     authServer:
       authority: http://eshop-st-authserver
       requireHttpsMetadata: "false"
+      swaggerClientId: WebGateway_Swagger
+      swaggerClientSecret: "1q2w3e*"
+    remoteServices:
+      abpIdentityBaseUrl: https://eshop-st-identity
+      useCurrentToken: "false"  
     dotnetEnv: Staging
     redisHost: es-st-redis
     rabbitmqHost: es-st-rabbitmq
@@ -112,6 +117,8 @@ gateway-web:
     authServer:
       authority: http://eshop-st-authserver
       requireHttpsMetadata: "false"
+      swaggerClientId: WebGateway_Swagger
+      swaggerClientSecret: "1q2w3e*"
     dotnetEnv: Staging
     redisHost: es-st-redis
     rabbitmqHost: es-st-rabbitmq
@@ -138,8 +145,10 @@ gateway-web-public:
     selfUrl: https://eshop-st-gateway-web-public
     globalConfigurationBaseUrl: http://eshop-st-gateway-public-web
     authServer:
-      authority: http://eshop-st-AUTHSERVER
+      authority: http://eshop-st-authserver
       requireHttpsMetadata: "false"
+      swaggerClientId: WebGateway_Swagger
+      swaggerClientSecret: "1q2w3e*"
     dotnetEnv: Staging
     redisHost: es-st-redis
     rabbitmqHost: es-st-rabbitmq
@@ -167,9 +176,9 @@ gateway-web-public:
       schema: http
       host: eshop-st-basket
       port: 80
-    orderService:
+    orderingService:
       schema: http
-      host: eshop-st-order
+      host: eshop-st-ordering
       port: 80
 
 # basket-service sub-chart override