diff --git a/gateways/web-public/src/EShopOnAbp.WebPublicGateway/appsettings.json b/gateways/web-public/src/EShopOnAbp.WebPublicGateway/appsettings.json
index 60ed6166..e1e08219 100644
--- a/gateways/web-public/src/EShopOnAbp.WebPublicGateway/appsettings.json
+++ b/gateways/web-public/src/EShopOnAbp.WebPublicGateway/appsettings.json
@@ -7,7 +7,7 @@
   "AuthServer": {
     "Authority": "http://localhost:8080/realms/master",
     "RequireHttpsMetadata": "true",
-    "SwaggerClientId": "WebGateway_Swagger",
+    "SwaggerClientId": "SwaggerClient",
     "SwaggerClientSecret": "1q2w3e*"
   },
   "Logging": {
diff --git a/gateways/web/src/EShopOnAbp.WebGateway/appsettings.json b/gateways/web/src/EShopOnAbp.WebGateway/appsettings.json
index 00dde9fb..487b5e11 100644
--- a/gateways/web/src/EShopOnAbp.WebGateway/appsettings.json
+++ b/gateways/web/src/EShopOnAbp.WebGateway/appsettings.json
@@ -8,7 +8,7 @@
     "Authority": "http://localhost:8080/realms/master",
     "RequireHttpsMetadata": "true",
     "MetadataAddress": "http://localhost:8080/realms/master",
-    "SwaggerClientId": "WebGateway_Swagger"
+    "SwaggerClientId": "SwaggerClient"
   },
   "Logging": {
     "LogLevel": {
diff --git a/services/basket/src/EShopOnAbp.BasketService/appsettings.json b/services/basket/src/EShopOnAbp.BasketService/appsettings.json
index 848af7b7..e1922980 100644
--- a/services/basket/src/EShopOnAbp.BasketService/appsettings.json
+++ b/services/basket/src/EShopOnAbp.BasketService/appsettings.json
@@ -7,7 +7,7 @@
     "Authority": "http://localhost:8080/realms/master",
     "RequireHttpsMetadata": "false",
     "MetadataAddress": "http://localhost:8080/realms/master",
-    "SwaggerClientId": "WebGateway_Swagger"
+    "SwaggerClientId": "SwaggerClient"
   },
   "RemoteServices": {
     "Catalog": {
diff --git a/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/appsettings.json b/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/appsettings.json
index a36a8c76..9fdb84ca 100644
--- a/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/appsettings.json
+++ b/services/catalog/src/EShopOnAbp.CatalogService.HttpApi.Host/appsettings.json
@@ -7,7 +7,7 @@
     "Authority": "http://localhost:8080/realms/master",
     "RequireHttpsMetadata": "false",
     "MetadataAddress": "http://localhost:8080/realms/master",
-    "SwaggerClientId": "WebGateway_Swagger"
+    "SwaggerClientId": "SwaggerClient"
   },
   "Logging": {
     "LogLevel": {
diff --git a/services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host/appsettings.json b/services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host/appsettings.json
index 1d6763a6..3590e555 100644
--- a/services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host/appsettings.json
+++ b/services/cmskit/src/EShopOnAbp.CmskitService.HttpApi.Host/appsettings.json
@@ -7,7 +7,7 @@
     "Authority": "http://localhost:8080/realms/master",
     "RequireHttpsMetadata": "false",
     "MetadataAddress": "http://localhost:8080/realms/master",
-    "SwaggerClientId": "WebGateway_Swagger"
+    "SwaggerClientId": "SwaggerClient"
   },
   "Logging": {
     "LogLevel": {
diff --git a/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/appsettings.json b/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/appsettings.json
index 8b7c19da..fe016048 100644
--- a/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/appsettings.json
+++ b/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/appsettings.json
@@ -7,7 +7,7 @@
     "Authority": "http://localhost:8080/realms/master",
     "RequireHttpsMetadata": "false",
     "MetadataAddress": "http://localhost:8080/realms/master",
-    "SwaggerClientId": "WebGateway_Swagger"
+    "SwaggerClientId": "SwaggerClient"
   },
   "Keycloak": {
     "url": "http://localhost:8080",
diff --git a/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/appsettings.json b/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/appsettings.json
index aa730d23..d15531c8 100644
--- a/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/appsettings.json
+++ b/services/ordering/src/EShopOnAbp.OrderingService.HttpApi.Host/appsettings.json
@@ -7,7 +7,7 @@
     "Authority": "http://localhost:8080/realms/master",
     "RequireHttpsMetadata": "false",
     "MetadataAddress": "http://localhost:8080/realms/master",
-    "SwaggerClientId": "WebGateway_Swagger"
+    "SwaggerClientId": "SwaggerClient"
   },
   "Logging": {
     "LogLevel": {
diff --git a/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Host/appsettings.json b/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Host/appsettings.json
index 0962ca7e..7624b30e 100644
--- a/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Host/appsettings.json
+++ b/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Host/appsettings.json
@@ -7,7 +7,7 @@
     "Authority": "http://localhost:8080/realms/master",
     "RequireHttpsMetadata": "false",
     "MetadataAddress": "http://localhost:8080/realms/master",
-    "SwaggerClientId": "WebGateway_Swagger"
+    "SwaggerClientId": "SwaggerClient"
   },
   "Logging": {
     "LogLevel": {