diff --git a/gateways/web-public/src/EShopOnAbp.WebPublicGateway/yarp.json b/gateways/web-public/src/EShopOnAbp.WebPublicGateway/yarp.json
index 44835f94..b0bac38e 100644
--- a/gateways/web-public/src/EShopOnAbp.WebPublicGateway/yarp.json
+++ b/gateways/web-public/src/EShopOnAbp.WebPublicGateway/yarp.json
@@ -23,19 +23,19 @@
         ]
       },
       "FeatureManagement": {
-        "ClusterId": "feature-management-cluster",
+        "ClusterId": "administrationCluster",
         "Match": {
           "Path": "/api/feature-management/{**everything}"
         }
       },
       "PermissionManagement": {
-        "ClusterId": "permission-management-cluster",
+        "ClusterId": "administrationCluster",
         "Match": {
           "Path": "/api/permission-management/{**everything}"
         }
       },
       "SettingManagement": {
-        "ClusterId": "setting-management-cluster",
+        "ClusterId": "administrationCluster",
         "Match": {
           "Path": "/api/setting-management/{**everything}"
         }
@@ -64,8 +64,8 @@
           { "PathRemovePrefix": "/swagger-json/Catalog" }
         ]
       },
-      "product-picture-route": {
-        "ClusterId": "productPictureCluster",
+      "ProductPictures": {
+        "ClusterId": "catalogCluster",
         "Match": {
           "Path": "/product-images/{**everything}",
           "Methods": [ "GET" ]
@@ -77,6 +77,15 @@
           "Path": "/api/basket/{**everything}"
         }
       },
+      "Basket Service Swagger": {
+        "ClusterId": "basketCluster",
+        "Match": {
+          "Path": "/swagger-json/Basket/swagger/v1/swagger.json"
+        },
+        "Transforms": [
+          { "PathRemovePrefix": "/swagger-json/Basket" }
+        ]
+      },
       "Ordering Service": {
         "ClusterId": "orderingCluster",
         "Match": {
@@ -112,6 +121,15 @@
         "Match": {
           "Path": "/api/payment/{**everything}"
         }
+      },
+      "Payment Service Swagger": {
+        "ClusterId": "paymentCluster",
+        "Match": {
+          "Path": "/swagger-json/Payment/swagger/v1/swagger.json"
+        },
+        "Transforms": [
+          { "PathRemovePrefix": "/swagger-json/Payment" }
+        ]
       }
     },
     "Clusters": {
@@ -129,20 +147,6 @@
           }
         }
       },
-      "permission-management-cluster": {
-        "Destinations": {
-          "destination1": {
-            "Address": "https://localhost:44353"
-          }
-        }
-      },
-      "setting-management-cluster": {
-        "Destinations": {
-          "destination1": {
-            "Address": "https://localhost:44353"
-          }
-        }
-      },
       "catalogCluster": {
         "Destinations": {
           "destination1": {
@@ -171,13 +175,6 @@
           }
         }
       },
-      "productPictureCluster": {
-        "Destinations": {
-          "destination1": {
-            "Address": "https://localhost:44354"
-          }
-        }
-      },
       "paymentCluster": {
         "Destinations": {
           "destination1": {