diff --git a/deploy/templates/values.yaml b/deploy/templates/values.yaml
index 3a36ca4e..48cfca23 100644
--- a/deploy/templates/values.yaml
+++ b/deploy/templates/values.yaml
@@ -92,6 +92,7 @@ argo-cd:
   {{- end }}
   {{- if and ( not .Values.bootstrap ) .Values.istio.enabled }}
   istio:
-    enabled: {{ index .Values "argo-cd" "istio" "enabled" }}
-    gateway: {{ index .Values "argo-cd" "istio" "gateway" }}
+    {{- with index .Values "argo-cd" "istio" }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
   {{- end }}