diff --git a/charts/tfy-k8s-aws-eks-inframold/Chart.yaml b/charts/tfy-k8s-aws-eks-inframold/Chart.yaml
index 01142e85..c0b75c81 100644
--- a/charts/tfy-k8s-aws-eks-inframold/Chart.yaml
+++ b/charts/tfy-k8s-aws-eks-inframold/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: tfy-k8s-aws-eks-inframold
-version: 0.1.8
+version: 0.1.9
 description: "Inframold, the superchart that configure your cluster on aws for truefoundry."
 maintainers:
   - name: truefoundry
diff --git a/charts/tfy-k8s-aws-eks-inframold/templates/truefoundry.yaml b/charts/tfy-k8s-aws-eks-inframold/templates/truefoundry.yaml
index a4354a04..d88031d6 100644
--- a/charts/tfy-k8s-aws-eks-inframold/templates/truefoundry.yaml
+++ b/charts/tfy-k8s-aws-eks-inframold/templates/truefoundry.yaml
@@ -46,14 +46,18 @@ spec:
           istio:
             virtualservice:
               enabled: true
-              {{- range $v := .Values.truefoundry.virtualservice.hosts }}
-              hosts: 
+              {{- if .Values.truefoundry.virtualservice.hosts }}
+              hosts:
+              {{- range $v := .Values.truefoundry.virtualservice.hosts }} 
               - {{ $v | quote }}
               {{- end }}
-              {{- range $v := .Values.truefoundry.virtualservice.gateways }}
+              {{- end }}
+              {{- if .Values.truefoundry.virtualservice.gateways }}
               gateways:
+              {{- range $v := .Values.truefoundry.virtualservice.gateways }}
               - {{ $v | quote }}
               {{- end }}
+              {{- end }}
         {{- end }} 
         nats:
           {{- with .Values.tolerations }}
diff --git a/charts/tfy-k8s-azure-aks-inframold/Chart.yaml b/charts/tfy-k8s-azure-aks-inframold/Chart.yaml
index 612502c8..027b08ef 100644
--- a/charts/tfy-k8s-azure-aks-inframold/Chart.yaml
+++ b/charts/tfy-k8s-azure-aks-inframold/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: tfy-k8s-azure-aks-inframold
-version: 0.1.8
+version: 0.1.9
 description: "Inframold, the superchart that configure your cluster on azure for truefoundry."
 maintainers:
   - name: truefoundry
diff --git a/charts/tfy-k8s-azure-aks-inframold/templates/truefoundry.yaml b/charts/tfy-k8s-azure-aks-inframold/templates/truefoundry.yaml
index a4354a04..d88031d6 100644
--- a/charts/tfy-k8s-azure-aks-inframold/templates/truefoundry.yaml
+++ b/charts/tfy-k8s-azure-aks-inframold/templates/truefoundry.yaml
@@ -46,14 +46,18 @@ spec:
           istio:
             virtualservice:
               enabled: true
-              {{- range $v := .Values.truefoundry.virtualservice.hosts }}
-              hosts: 
+              {{- if .Values.truefoundry.virtualservice.hosts }}
+              hosts:
+              {{- range $v := .Values.truefoundry.virtualservice.hosts }} 
               - {{ $v | quote }}
               {{- end }}
-              {{- range $v := .Values.truefoundry.virtualservice.gateways }}
+              {{- end }}
+              {{- if .Values.truefoundry.virtualservice.gateways }}
               gateways:
+              {{- range $v := .Values.truefoundry.virtualservice.gateways }}
               - {{ $v | quote }}
               {{- end }}
+              {{- end }}
         {{- end }} 
         nats:
           {{- with .Values.tolerations }}
diff --git a/charts/tfy-k8s-civo-talos-inframold/Chart.yaml b/charts/tfy-k8s-civo-talos-inframold/Chart.yaml
index 5bd4b758..32daa4a7 100644
--- a/charts/tfy-k8s-civo-talos-inframold/Chart.yaml
+++ b/charts/tfy-k8s-civo-talos-inframold/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: tfy-k8s-civo-talos-inframold
-version: 0.1.8
+version: 0.1.9
 description: "Inframold, the superchart that configure your cluster on civo for truefoundry."
 maintainers:
   - name: truefoundry
diff --git a/charts/tfy-k8s-civo-talos-inframold/templates/truefoundry.yaml b/charts/tfy-k8s-civo-talos-inframold/templates/truefoundry.yaml
index a4354a04..d88031d6 100644
--- a/charts/tfy-k8s-civo-talos-inframold/templates/truefoundry.yaml
+++ b/charts/tfy-k8s-civo-talos-inframold/templates/truefoundry.yaml
@@ -46,14 +46,18 @@ spec:
           istio:
             virtualservice:
               enabled: true
-              {{- range $v := .Values.truefoundry.virtualservice.hosts }}
-              hosts: 
+              {{- if .Values.truefoundry.virtualservice.hosts }}
+              hosts:
+              {{- range $v := .Values.truefoundry.virtualservice.hosts }} 
               - {{ $v | quote }}
               {{- end }}
-              {{- range $v := .Values.truefoundry.virtualservice.gateways }}
+              {{- end }}
+              {{- if .Values.truefoundry.virtualservice.gateways }}
               gateways:
+              {{- range $v := .Values.truefoundry.virtualservice.gateways }}
               - {{ $v | quote }}
               {{- end }}
+              {{- end }}
         {{- end }} 
         nats:
           {{- with .Values.tolerations }}
diff --git a/charts/tfy-k8s-gcp-gke-standard-inframold/Chart.yaml b/charts/tfy-k8s-gcp-gke-standard-inframold/Chart.yaml
index a6a93d05..0e1e7c65 100644
--- a/charts/tfy-k8s-gcp-gke-standard-inframold/Chart.yaml
+++ b/charts/tfy-k8s-gcp-gke-standard-inframold/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: tfy-k8s-gcp-gke-standard-inframold
-version: 0.1.8
+version: 0.1.9
 description: "Inframold, the superchart that configure your cluster on gcp for truefoundry."
 maintainers:
   - name: truefoundry
diff --git a/charts/tfy-k8s-gcp-gke-standard-inframold/templates/truefoundry.yaml b/charts/tfy-k8s-gcp-gke-standard-inframold/templates/truefoundry.yaml
index a4354a04..d88031d6 100644
--- a/charts/tfy-k8s-gcp-gke-standard-inframold/templates/truefoundry.yaml
+++ b/charts/tfy-k8s-gcp-gke-standard-inframold/templates/truefoundry.yaml
@@ -46,14 +46,18 @@ spec:
           istio:
             virtualservice:
               enabled: true
-              {{- range $v := .Values.truefoundry.virtualservice.hosts }}
-              hosts: 
+              {{- if .Values.truefoundry.virtualservice.hosts }}
+              hosts:
+              {{- range $v := .Values.truefoundry.virtualservice.hosts }} 
               - {{ $v | quote }}
               {{- end }}
-              {{- range $v := .Values.truefoundry.virtualservice.gateways }}
+              {{- end }}
+              {{- if .Values.truefoundry.virtualservice.gateways }}
               gateways:
+              {{- range $v := .Values.truefoundry.virtualservice.gateways }}
               - {{ $v | quote }}
               {{- end }}
+              {{- end }}
         {{- end }} 
         nats:
           {{- with .Values.tolerations }}
diff --git a/charts/tfy-k8s-generic-inframold/Chart.yaml b/charts/tfy-k8s-generic-inframold/Chart.yaml
index d250ecef..70e184b3 100644
--- a/charts/tfy-k8s-generic-inframold/Chart.yaml
+++ b/charts/tfy-k8s-generic-inframold/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: tfy-k8s-generic-inframold
-version: 0.1.8
+version: 0.1.9
 description: "Inframold, the superchart that configure your cluster on generic for truefoundry."
 maintainers:
   - name: truefoundry
diff --git a/charts/tfy-k8s-generic-inframold/templates/truefoundry.yaml b/charts/tfy-k8s-generic-inframold/templates/truefoundry.yaml
index a4354a04..d88031d6 100644
--- a/charts/tfy-k8s-generic-inframold/templates/truefoundry.yaml
+++ b/charts/tfy-k8s-generic-inframold/templates/truefoundry.yaml
@@ -46,14 +46,18 @@ spec:
           istio:
             virtualservice:
               enabled: true
-              {{- range $v := .Values.truefoundry.virtualservice.hosts }}
-              hosts: 
+              {{- if .Values.truefoundry.virtualservice.hosts }}
+              hosts:
+              {{- range $v := .Values.truefoundry.virtualservice.hosts }} 
               - {{ $v | quote }}
               {{- end }}
-              {{- range $v := .Values.truefoundry.virtualservice.gateways }}
+              {{- end }}
+              {{- if .Values.truefoundry.virtualservice.gateways }}
               gateways:
+              {{- range $v := .Values.truefoundry.virtualservice.gateways }}
               - {{ $v | quote }}
               {{- end }}
+              {{- end }}
         {{- end }} 
         nats:
           {{- with .Values.tolerations }}