diff --git a/etc/k8s/eshoponabp/charts/public-webgateway/Chart.yaml b/etc/k8s/eshoponabp/charts/gateway-public-web/Chart.yaml
similarity index 70%
rename from etc/k8s/eshoponabp/charts/public-webgateway/Chart.yaml
rename to etc/k8s/eshoponabp/charts/gateway-public-web/Chart.yaml
index b2cd0e01..e80e736d 100644
--- a/etc/k8s/eshoponabp/charts/public-webgateway/Chart.yaml
+++ b/etc/k8s/eshoponabp/charts/gateway-public-web/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
-name: public-webgateway
+name: gateway-public-web
 appVersion: "1.0"
 description: eShopOnAbp Public Web Gateway Application
 version: 1.0.0
-type: application
\ No newline at end of file
+type: application
diff --git a/etc/k8s/eshoponabp/charts/public-webgateway/templates/public-webgateway-configmap.yaml b/etc/k8s/eshoponabp/charts/gateway-public-web/templates/gateway-public-web-configmap.yaml
similarity index 100%
rename from etc/k8s/eshoponabp/charts/public-webgateway/templates/public-webgateway-configmap.yaml
rename to etc/k8s/eshoponabp/charts/gateway-public-web/templates/gateway-public-web-configmap.yaml
diff --git a/etc/k8s/eshoponabp/charts/public-webgateway/templates/public-webgateway-ingress.yaml b/etc/k8s/eshoponabp/charts/gateway-public-web/templates/gateway-public-web-ingress.yaml
similarity index 79%
rename from etc/k8s/eshoponabp/charts/public-webgateway/templates/public-webgateway-ingress.yaml
rename to etc/k8s/eshoponabp/charts/gateway-public-web/templates/gateway-public-web-ingress.yaml
index 0a24b78c..bc53288f 100644
--- a/etc/k8s/eshoponabp/charts/public-webgateway/templates/public-webgateway-ingress.yaml
+++ b/etc/k8s/eshoponabp/charts/gateway-public-web/templates/gateway-public-web-ingress.yaml
@@ -15,16 +15,16 @@ metadata:
 spec:
   tls:
   - hosts:
-      - {{ .Values.global.publicWebGateway.domain }}
+      - {{ .Values.global.gatewayPublicWeb.domain }}
 {{- if eq .Release.Name "eh-az" }}
-      - {{ print "www." .Values.global.publicWebGateway.domain }}
+      - {{ print "www." .Values.global.gatewayPublicWeb.domain }}
 {{- end }}
     secretName: {{ .Release.Name }}-{{ .Chart.Name }}-tls
   rules:
 {{- if eq .Release.Name "eh-az" }}
-  - host: "{{ print "www." .Values.global.publicWebGateway.domain }}"
+  - host: "{{ print "www." .Values.global.gatewayPublicWeb.domain }}"
 {{- else }}
-  - host: "{{ .Values.global.publicWebGateway.domain }}"
+  - host: "{{ .Values.global.gatewayPublicWeb.domain }}"
 {{- end }}
     http:
       paths:
diff --git a/etc/k8s/eshoponabp/charts/public-webgateway/templates/public-webgateway-service.yaml b/etc/k8s/eshoponabp/charts/gateway-public-web/templates/gateway-public-web-service.yaml
similarity index 100%
rename from etc/k8s/eshoponabp/charts/public-webgateway/templates/public-webgateway-service.yaml
rename to etc/k8s/eshoponabp/charts/gateway-public-web/templates/gateway-public-web-service.yaml
diff --git a/etc/k8s/eshoponabp/charts/public-webgateway/templates/public-webgateway.yaml b/etc/k8s/eshoponabp/charts/gateway-public-web/templates/gateway-public-web.yaml
similarity index 87%
rename from etc/k8s/eshoponabp/charts/public-webgateway/templates/public-webgateway.yaml
rename to etc/k8s/eshoponabp/charts/gateway-public-web/templates/gateway-public-web.yaml
index c883ed07..9b465971 100644
--- a/etc/k8s/eshoponabp/charts/public-webgateway/templates/public-webgateway.yaml
+++ b/etc/k8s/eshoponabp/charts/gateway-public-web/templates/gateway-public-web.yaml
@@ -12,7 +12,7 @@ spec:
         app: {{ .Release.Name }}-{{ .Chart.Name }}
     spec:
       containers:
-      - image: {{ .Values.global.publicWebGateway.containerImage }}:{{ .Values.global.eshoponabpImageVersion }}
+      - image: {{ .Values.global.gatewayPublicWeb.containerImage }}:{{ .Values.global.eshoponabpImageVersion }}
         imagePullPolicy: {{ .Values.global.imagePullPolicy }}
         name: {{ .Release.Name }}-{{ .Chart.Name }}
         ports:
diff --git a/etc/k8s/eshoponabp/charts/public-webgateway/values.yaml b/etc/k8s/eshoponabp/charts/gateway-public-web/values.yaml
similarity index 96%
rename from etc/k8s/eshoponabp/charts/public-webgateway/values.yaml
rename to etc/k8s/eshoponabp/charts/gateway-public-web/values.yaml
index 9fe11c70..b891235d 100644
--- a/etc/k8s/eshoponabp/charts/public-webgateway/values.yaml
+++ b/etc/k8s/eshoponabp/charts/gateway-public-web/values.yaml
@@ -14,4 +14,5 @@
     - name: "Routes__1__DownstreamHostAndPorts__0__Host"
       value: "eshoponabp-administration"
     - name: "Routes__1__DownstreamHostAndPorts__0__Port"
-      value: "80"  
\ No newline at end of file
+      value: "80"
+    
\ No newline at end of file
diff --git a/etc/k8s/eshoponabp/values.yaml b/etc/k8s/eshoponabp/values.yaml
index 936ec146..081415c7 100644
--- a/etc/k8s/eshoponabp/values.yaml
+++ b/etc/k8s/eshoponabp/values.yaml
@@ -113,10 +113,18 @@ global:
     url: https://eshoponabp-saas
     containerImage: "eshoponabp/service-saas"
     connString: "Server=eshoponabp-sqldb,1433;Database=EShopOnAbp_Saas;User Id=sa;password=myPassw@rd;MultipleActiveResultSets=true"
-  publicWebGateway:
-    domain:  eshoponabp-public-webgateway
-    url: https://eshoponabp-public-webgateway
+  gatewayWeb:
+    domain: eshoponabp-gateway-web
+    url: https://eshoponabp-gateway-web
+    containerImage: "eshoponabp/gateway-web"
+  gatewayPublicWeb:
+    domain: eshoponabp-gateway-public-web
+    url: https://eshoponabp-gateway-public-web
     containerImage: "eshoponabp/gateway-publicweb"
+  gatewayInternal:
+    domain: eshoponabp-gateway-internal
+    url: https://eshoponabp-gateway-internal
+    containerImage: "eshoponabp/gateway-internal"
   redisConfiguration: "eshoponabp-redis"
   rabbitMqHostName: "eshoponabp-rabbitmq"
   elasticSearchUrl: ""