diff --git a/src/prod/Chart.yaml b/src/prod/Chart.yaml
index 31269051..a415f16c 100644
--- a/src/prod/Chart.yaml
+++ b/src/prod/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.2.6
+version: 0.2.7
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/src/prod/templates/virtualservice.yaml b/src/prod/templates/virtualservice.yaml
index 02b6406f..ff830da7 100644
--- a/src/prod/templates/virtualservice.yaml
+++ b/src/prod/templates/virtualservice.yaml
@@ -8,9 +8,14 @@ metadata:
     app.kubernetes.io/instance: {{ .Release.Name }}
 spec:
   gateways:
+    {{- if .Values.istio.gateway.create -}}
     - istio-system/public
+    {{- else -}}
+    {{- range .Values.istio.virtualService.gateways }}
+    - {{ . }}
+    {{- end }}
   hosts:
-    {{- range .Values.istio.VirtualService.hosts }}
+    {{- range .Values.istio.virtualService.hosts }}
     - {{ . }}
     {{- end }}
   tcp:
diff --git a/src/prod/values.yaml b/src/prod/values.yaml
index f4aeb294..a10bc21e 100644
--- a/src/prod/values.yaml
+++ b/src/prod/values.yaml
@@ -107,7 +107,8 @@ istio:
     credentialName:
     minProtocolVersion: TLSV1_2
     mode: SIMPLE
-  VirtualService:
+  virtualService:
+    gateways: []
     hosts:
       - ""
 sto: