diff --git a/etc/k8s/eshoponabp/charts/basket/templates/basket-deployment.yaml b/etc/k8s/eshoponabp/charts/basket/templates/basket-deployment.yaml
index 8105cacf..67110761 100644
--- a/etc/k8s/eshoponabp/charts/basket/templates/basket-deployment.yaml
+++ b/etc/k8s/eshoponabp/charts/basket/templates/basket-deployment.yaml
@@ -17,7 +17,7 @@ spec:
         name: {{ .Release.Name }}-{{ .Chart.Name }}
         ports:
         - name: http
-          containerPort: 80
+          containerPort: 8080
         - name: https
           containerPort: 443
         env:
diff --git a/etc/k8s/eshoponabp/charts/catalog/templates/catalog-deployment.yaml b/etc/k8s/eshoponabp/charts/catalog/templates/catalog-deployment.yaml
index e66bd8ab..dd0cfa19 100644
--- a/etc/k8s/eshoponabp/charts/catalog/templates/catalog-deployment.yaml
+++ b/etc/k8s/eshoponabp/charts/catalog/templates/catalog-deployment.yaml
@@ -17,14 +17,14 @@ spec:
         name: {{ .Release.Name }}-{{ .Chart.Name }}
         ports:
         - name: http
-          containerPort: 80
+          containerPort: 8080
           protocol: TCP
         - name: grpc
           containerPort: 81
           protocol: TCP
         env:
         - name: "ASPNETCORE_URLS"
-          value: "http://+:80;http://+:81" 
+          value: "http://+:8080;http://+:81" 
         - name: "DOTNET_ENVIRONMENT"
           value: "{{ .Values.config.dotnetEnv }}"         
         - name: App__SelfUrl
diff --git a/etc/k8s/eshoponabp/charts/catalog/values.yaml b/etc/k8s/eshoponabp/charts/catalog/values.yaml
index 9c72c62a..4e09e976 100644
--- a/etc/k8s/eshoponabp/charts/catalog/values.yaml
+++ b/etc/k8s/eshoponabp/charts/catalog/values.yaml
@@ -16,7 +16,7 @@ config:
   stringEncryptionDefaultPassPhrase: gsKnGZ041HLL4IM8
   grpcPort: 81
   kestrel:
-    httpUrl: http://eshop-st-catalog:80
+    httpUrl: http://eshop-st-catalog:8080
     httpProtocols: Http1AndHttp2
     grpcUrl: http://eshop-st-catalog:81
     grpcProtocols: Http2
diff --git a/etc/k8s/eshoponabp/charts/cmskit/templates/cmskit-deployment.yaml b/etc/k8s/eshoponabp/charts/cmskit/templates/cmskit-deployment.yaml
index 13a08a9d..da0340d5 100644
--- a/etc/k8s/eshoponabp/charts/cmskit/templates/cmskit-deployment.yaml
+++ b/etc/k8s/eshoponabp/charts/cmskit/templates/cmskit-deployment.yaml
@@ -17,7 +17,7 @@ spec:
         name: {{ .Release.Name }}-{{ .Chart.Name }}
         ports:
         - name: http
-          containerPort: 80
+          containerPort: 8080
         - name: https
           containerPort: 443
         env:
diff --git a/etc/k8s/eshoponabp/charts/gateway-web/values.yaml b/etc/k8s/eshoponabp/charts/gateway-web/values.yaml
index 945d27e5..3e2a1273 100644
--- a/etc/k8s/eshoponabp/charts/gateway-web/values.yaml
+++ b/etc/k8s/eshoponabp/charts/gateway-web/values.yaml
@@ -28,6 +28,7 @@ reRoutes:
   cmskitService:
     url: http://eshop-st-cmskit
     dns: https://cmskit.eshoponabp.dev
+    
 ingress:
   host: # eshop-st-gateway-web
   tlsSecret: eshop-wildcard-tls
diff --git a/etc/k8s/eshoponabp/charts/identity/templates/identity-deployment.yaml b/etc/k8s/eshoponabp/charts/identity/templates/identity-deployment.yaml
index 9f7994a2..22e93580 100644
--- a/etc/k8s/eshoponabp/charts/identity/templates/identity-deployment.yaml
+++ b/etc/k8s/eshoponabp/charts/identity/templates/identity-deployment.yaml
@@ -17,7 +17,7 @@ spec:
         name: {{ .Release.Name }}-{{ .Chart.Name }}
         ports:
         - name: http
-          containerPort: 80
+          containerPort: 8080
         - name: https
           containerPort: 443
         env:
diff --git a/etc/k8s/eshoponabp/charts/ordering/templates/ordering-deployment.yaml b/etc/k8s/eshoponabp/charts/ordering/templates/ordering-deployment.yaml
index 78bcb82e..3ad228eb 100644
--- a/etc/k8s/eshoponabp/charts/ordering/templates/ordering-deployment.yaml
+++ b/etc/k8s/eshoponabp/charts/ordering/templates/ordering-deployment.yaml
@@ -17,7 +17,7 @@ spec:
         name: {{ .Release.Name }}-{{ .Chart.Name }}
         ports:
         - name: http
-          containerPort: 80
+          containerPort: 8080
         - name: https
           containerPort: 443
         env:
diff --git a/etc/k8s/eshoponabp/charts/payment/templates/payment-deployment.yaml b/etc/k8s/eshoponabp/charts/payment/templates/payment-deployment.yaml
index c3526b1b..30753515 100644
--- a/etc/k8s/eshoponabp/charts/payment/templates/payment-deployment.yaml
+++ b/etc/k8s/eshoponabp/charts/payment/templates/payment-deployment.yaml
@@ -17,7 +17,7 @@ spec:
         name: {{ .Release.Name }}-{{ .Chart.Name }}
         ports:
         - name: http
-          containerPort: 80
+          containerPort: 8080
         - name: https
           containerPort: 443
         env:
diff --git a/etc/k8s/eshoponabp/charts/public-web/templates/public-web-deployment.yaml b/etc/k8s/eshoponabp/charts/public-web/templates/public-web-deployment.yaml
index 1d644d77..2bc88b3a 100644
--- a/etc/k8s/eshoponabp/charts/public-web/templates/public-web-deployment.yaml
+++ b/etc/k8s/eshoponabp/charts/public-web/templates/public-web-deployment.yaml
@@ -17,7 +17,7 @@ spec:
         name: {{ .Release.Name }}-{{ .Chart.Name }}
         ports:
         - name: http
-          containerPort: 80
+          containerPort: 8080
         - name: https
           containerPort: 443
         env:
diff --git a/etc/k8s/eshoponabp/values.st.yaml b/etc/k8s/eshoponabp/values.st.yaml
index 5ea13ffe..aeb8a2b2 100644
--- a/etc/k8s/eshoponabp/values.st.yaml
+++ b/etc/k8s/eshoponabp/values.st.yaml
@@ -49,12 +49,12 @@ web:
 public-web:
   config:
     selfUrl: https://eshoponabp.dev
-    gatewayUrl: http://gateway-public.eshoponabp.dev/
+    gatewayUrl: http://eshop-st-gateway-web-public:8080/
     authServer:
-      authority: http://account.eshoponabp.dev
+      authority: https://account.eshoponabp.dev
       requireHttpsMetadata: "false"
-      isOnProd: "false"
-      metaAddress: http://account.eshoponabp.dev
+      isOnProd: "true"
+      metaAddress: http://eshop-st-keycloak:8080/
     dotnetEnv: Staging
     redisHost: eshop-st-redis
     rabbitmqHost: eshop-st-rabbitmq
@@ -153,19 +153,19 @@ gateway-web:
     tag: 1.0.0
   reRoutes:
     identityService:
-      url: http://eshop-st-identity
+      url: http://eshop-st-identity:8080
       dns: https://identity.eshoponabp.dev
     administrationService:
-      url: http://eshop-st-administration
+      url: http://eshop-st-administration:8080
       dns: https://administration.eshoponabp.dev
     catalogService:
-      url: http://eshop-st-catalog
+      url: http://eshop-st-catalog:8080
       dns: https://catalog.eshoponabp.dev
     orderingService:
-      url: http://eshop-st-ordering
+      url: http://eshop-st-ordering:8080
       dns: https://ordering.eshoponabp.dev
     cmskitService:
-      url: http://eshop-st-cmskit
+      url: http://eshop-st-cmskit:8080
       dns: https://cmskit.eshoponabp.dev
 
 # gateway-web-public sub-chart override
@@ -189,25 +189,25 @@ gateway-web-public:
     tag: 1.0.0
   reRoutes:
     identityService:
-      url: http://eshop-st-identity
+      url: http://eshop-st-identity:8080
       dns: https://identity.eshoponabp.dev
     administrationService:
-      url: http://eshop-st-administration
+      url: http://eshop-st-administration:8080
       dns: https://administration.eshoponabp.dev
     catalogService:
-      url: http://eshop-st-catalog
+      url: http://eshop-st-catalog:8080
       dns: https://catalog.eshoponabp.dev
     basketService:
-      url: http://eshop-st-basket
+      url: http://eshop-st-basket:8080
       dns: https://basket.eshoponabp.dev
     orderingService:
-      url: http://eshop-st-ordering
+      url: http://eshop-st-ordering:8080
       dns: https://ordering.eshoponabp.dev
     cmskitService:
-      url: http://eshop-st-cmskit
+      url: http://eshop-st-cmskit:8080
       dns: https://cmskit.eshoponabp.dev
     paymentService:
-      url: http://eshop-st-payment
+      url: http://eshop-st-payment:8080
       dns: https://payment.eshoponabp.dev
 
 # basket-service sub-chart override
@@ -227,8 +227,8 @@ basket:
     rabbitmqHost: eshop-st-rabbitmq
     elasticsearchHost: eshop-st-elasticsearch
     remoteServices:
-      catalogBaseUrl: http://catalog.eshoponabp.dev:80
-      catalogGrpcUrl: http://catalog.eshoponabp.dev:81
+      catalogBaseUrl: http://eshop-st-catalog:8080
+      catalogGrpcUrl: http://eshop-st-catalog:81
   ingress:
     host: basket.eshoponabp.dev
     tlsSecret: eshop-wildcard-tls
@@ -254,7 +254,7 @@ catalog:
     rabbitmqHost: eshop-st-rabbitmq
     elasticsearchHost: eshop-st-elasticsearch
     kestrel:
-      httpUrl: http://catalog.eshoponabp.dev:80
+      httpUrl: http://catalog.eshoponabp.dev:8080
       httpProtocols: Http1AndHttp2
       grpcUrl: http://catalog.eshoponabp.dev:81
       grpcProtocols: Http2