diff --git a/etc/k8s/eshoponabp/charts/gateway-web/templates/gateway-web-configmap.yaml b/etc/k8s/eshoponabp/charts/gateway-web/templates/gateway-web-configmap.yaml
index a2060492..0e28ffe8 100644
--- a/etc/k8s/eshoponabp/charts/gateway-web/templates/gateway-web-configmap.yaml
+++ b/etc/k8s/eshoponabp/charts/gateway-web/templates/gateway-web-configmap.yaml
@@ -5,127 +5,138 @@ metadata:
 data:
   yarp.json: |-
     {
-    "ReverseProxy": {
-      "Routes": {
-        "Account Service": {
-          "ClusterId": "account-cluster",
-          "Match": {
-            "Path": "/api/account/{**everything}"
-          }
-        },
-        "Identity Service": {
-          "ClusterId": "identity-cluster",
-          "Match": {
-            "Path": "/api/identity/{**everything}"
-          }
-        },
-        "Administration Service": {
-          "ClusterId": "administration-cluster",
-          "Match": {
-            "Path": "/api/abp/{**everything}"
-          }
-        },
-        "feature-management-route": {
-          "ClusterId": "feature-management-cluster",
-          "Match": {
-            "Path": "/api/feature-management/{**everything}"
-          }
-        },
-        "permission-management-route": {
-          "ClusterId": "permission-management-cluster",
-          "Match": {
-            "Path": "/api/permission-management/{**everything}"
-          }
-        },
-        "setting-management-route": {
-          "ClusterId": "setting-management-cluster",
-          "Match": {
-            "Path": "/api/setting-management/{**everything}"
-          }
-        },
-        "Catalog Service": {
-          "ClusterId": "catalogCluster",
-          "Match": {
-            "Path": "/api/catalog/{**everything}"
-          }
-        },
-        "Ordering Service": {
-          "ClusterId": "orderingCluster",
-          "Match": {
-            "Path": "/api/ordering/{**everything}"
-          }
-        },
-        "Cmskit Service": {
-          "ClusterId": "cmskitCluster",
-          "Match": {
-            "Path": "/api/cmskit/{**everything}"
-          }
-        }
-      },
-      "Clusters": {
-        "account-cluster": {
-          "Destinations": {
-            "destination1": {
-              "Address": "{{ .Values.reRoutes.accountService.url }}"
+      "ReverseProxy": {
+        "Routes": {
+          "AbpApi": {
+            "ClusterId": "Administration",
+            "Match": {
+              "Path": "/api/abp/{**catch-all}"
             }
-          }
-        },
-        "identity-cluster": {
-          "Destinations": {
-            "destination1": {
-              "Address": "{{ .Values.reRoutes.identityService.url }}"
+          },
+          "Identity Service": {
+            "ClusterId": "Identity",
+            "Match": {
+              "Path": "/api/identity/{**everything}"
             }
-          }
-        },
-        "administration-cluster": {
-          "Destinations": {
-            "destination1": {
-              "Address": "{{ .Values.reRoutes.administrationService.url }}"
+          },
+          "Identity Service Swagger": {
+            "ClusterId": "Identity",
+            "Match": {
+              "Path": "/swagger-json/Identity/swagger/v1/swagger.json"
+            },
+            "Transforms": [
+              { "PathRemovePrefix": "/swagger-json/Identity" }
+            ]
+          },
+          "FeatureManagement": {
+            "ClusterId": "Administration",
+            "Match": {
+              "Path": "/api/feature-management/{**everything}"
             }
-          }
-        },
-        "feature-management-cluster": {
-          "Destinations": {
-            "destination1": {
-              "Address": "{{ .Values.reRoutes.administrationService.url }}"
+          },
+          "PermissionManagement": {
+            "ClusterId": "Administration",
+            "Match": {
+              "Path": "/api/permission-management/{**everything}"
             }
-          }
-        },
-        "permission-management-cluster": {
-          "Destinations": {
-            "destination1": {
-              "Address": "{{ .Values.reRoutes.administrationService.url }}"
+          },
+          "SettingManagement": {
+            "ClusterId": "Administration",
+            "Match": {
+              "Path": "/api/setting-management/{**everything}"
             }
-          }
-        },
-        "setting-management-cluster": {
-          "Destinations": {
-            "destination1": {
-              "Address": "{{ .Values.reRoutes.administrationService.url }}"
+          },
+          "Administration Service Swagger": {
+            "ClusterId": "Administration",
+            "Match": {
+              "Path": "/swagger-json/Administration/swagger/v1/swagger.json"
+            },
+            "Transforms": [
+              { "PathRemovePrefix": "/swagger-json/Administration" }
+            ]
+          },
+          "Catalog Service": {
+            "ClusterId": "Catalog",
+            "Match": {
+              "Path": "/api/catalog/{**everything}"
             }
-          }
-        },
-        "catalogCluster": {
-          "Destinations": {
-            "destination1": {
-              "Address": "{{ .Values.reRoutes.catalogService.url }}"
+          },
+          "Catalog Service Swagger": {
+            "ClusterId": "Catalog",
+            "Match": {
+              "Path": "/swagger-json/Catalog/swagger/v1/swagger.json"
+            },
+            "Transforms": [
+              { "PathRemovePrefix": "/swagger-json/Catalog" }
+            ]
+          },
+          "Ordering Service": {
+            "ClusterId": "Ordering",
+            "Match": {
+              "Path": "/api/ordering/{**everything}"
             }
-          }
-        },
-        "orderingCluster": {
-          "Destinations": {
-            "destination1": {
-              "Address": "{{ .Values.reRoutes.orderingService.url }}"
+          },
+          "Ordering Service Swagger": {
+            "ClusterId": "Ordering",
+            "Match": {
+              "Path": "/swagger-json/Ordering/swagger/v1/swagger.json"
+            },
+            "Transforms": [
+              { "PathRemovePrefix": "/swagger-json/Ordering" }
+            ]
+          },
+          "Cmskit Service": {
+            "ClusterId": "Cmskit",
+            "Match": {
+              "Path": "/api/cmskit/{**everything}"
             }
-          }
-        },
-        "cmskitCluster": {
-          "Destinations": {
-            "destination1": {
-              "Address": "{{ .Values.reRoutes.cmskitService.url }}"
+          },
+          "Cmskit Service Swagger": {
+            "ClusterId": "Cmskit",
+            "Match": {
+              "Path": "/swagger-json/Cmskit/swagger/v1/swagger.json"
+            },
+            "Transforms": [
+              { "PathRemovePrefix": "/swagger-json/Cmskit" }
+            ]
+          }
+        },
+        "Clusters": {
+          "Identity": {
+            "Destinations": {
+              "destination1": {
+                "Address": "{{ .Values.reRoutes.identityService.url }}"
+              }
+            }
+          },
+          "Administration": {
+            "Destinations": {
+              "destination1": {
+                "Address": "{{ .Values.reRoutes.administrationService.url }}"
+              }
+            }
+          },
+          "Catalog": {
+            "Destinations": {
+              "destination1": {
+                "Address": "{{ .Values.reRoutes.catalogService.url }}"
+              }
+            }
+          },
+          "Ordering": {
+            "Destinations": {
+              "destination1": {
+                "Address": "{{ .Values.reRoutes.orderingService.url }}"
+              }
+            }
+          },
+          "Cmskit": {
+            "Destinations": {
+              "destination1": {
+                "Address": "{{ .Values.reRoutes.cmskitService.url }}"
+              }
             }
           }
         }
       }
-    }
     }
\ No newline at end of file
diff --git a/etc/k8s/eshoponabp/charts/gateway-web/values.yaml b/etc/k8s/eshoponabp/charts/gateway-web/values.yaml
index ab1df0f5..1aa3f51f 100644
--- a/etc/k8s/eshoponabp/charts/gateway-web/values.yaml
+++ b/etc/k8s/eshoponabp/charts/gateway-web/values.yaml
@@ -13,16 +13,16 @@ config:
   elasticsearchHost: #
   stringEncryptionDefaultPassPhrase: gsKnGZ041HLL4IM8
 reRoutes:
-  accountService:
-    url: http://eshop-st-authserver
   identityService:
-    url: http://eshop-st-identity
+    url: https://eshop-st-identity
   administrationService:
-    url: http://eshop-st-administration
+    url: https://eshop-st-administration
   catalogService:
-    url: http://eshop-st-catalog
+    url: https://eshop-st-catalog
   orderingService:
-    url: http://eshop-st-order
+    url: https://eshop-st-ordering
+  cmskitService:
+    url: https://eshop-st-cmskit
 ingress:
   host: # eshop-st-gateway-web
   tlsSecret: eshop-wildcard-tls
diff --git a/etc/k8s/eshoponabp/values.st.yaml b/etc/k8s/eshoponabp/values.st.yaml
index f7c827f8..88045717 100644
--- a/etc/k8s/eshoponabp/values.st.yaml
+++ b/etc/k8s/eshoponabp/values.st.yaml
@@ -143,18 +143,16 @@ gateway-web:
     repository: "eshoponabp/gateway-web"
     tag: 1.0.0
   reRoutes:
-    accountService:
-      url: http://account.eshoponabp.dev
     identityService:
-      url: http://identity.eshoponabp.dev
+      url: http://eshop-st-identity
     administrationService:
-      url: http://administration.eshoponabp.dev
+      url: http://eshop-st-administration
     catalogService:
-      url: http://catalog.eshoponabp.dev
+      url: http://eshop-st-catalog
     orderingService:
-      url: http://ordering.eshoponabp.dev
+      url: http://eshop-st-ordering
     cmskitService:
-      url: http://cmskit.eshoponabp.dev
+      url: http://eshop-st-cmskit
 
 # gateway-web-public sub-chart override
 gateway-web-public:
@@ -177,19 +175,19 @@ gateway-web-public:
     tag: 1.0.0
   reRoutes:
     identityService:
-      url: https://identity.eshoponabp.dev
+      url: http://identity.eshoponabp.dev
     administrationService:
-      url: https://administration.eshoponabp.dev
+      url: http://administration.eshoponabp.dev
     catalogService:
-      url: https://catalog.eshoponabp.dev
+      url: http://catalog.eshoponabp.dev
     basketService:
-      url: https://basket.eshoponabp.dev
+      url: http://basket.eshoponabp.dev
     orderingService:
-      url: https://ordering.eshoponabp.dev
+      url: http://ordering.eshoponabp.dev
     cmskitService:
-      url: https://cmskit.eshoponabp.dev
+      url: http://cmskit.eshoponabp.dev
     paymentService:
-      url: https://payment.eshoponabp.dev  
+      url: http://payment.eshoponabp.dev
 
 # basket-service sub-chart override
 basket: