diff --git a/argo/apps/templates/helm-apps.yaml b/argo/apps/templates/helm-apps.yaml
index 1f4b474..6851a93 100644
--- a/argo/apps/templates/helm-apps.yaml
+++ b/argo/apps/templates/helm-apps.yaml
@@ -23,6 +23,9 @@ spec:
   - repoURL: 'https://git.minhas.io/Asara/k8s.git'
     targetRevision: master
     path: argo/istio-ingress
+    helm:
+      valueFiles:
+      - $values/argo/{{ .app }}/values.yaml
   syncPolicy:
     automated:
       prune: true
diff --git a/argo/apps/values.yaml b/argo/apps/values.yaml
index 3d54619..4c3eaf1 100644
--- a/argo/apps/values.yaml
+++ b/argo/apps/values.yaml
@@ -5,8 +5,3 @@ helmApps:
     repoURL: https://okgolove.github.io/helm-charts
     chart: goldpinger
     revision: 5.5.0
-    istio:
-      commonName: goldpinger.teapot.masked.name
-      ingressSelector: ingressgateway-internal
-      issuer: vault-issuer
-      port: 80
diff --git a/argo/goldpinger/values.yaml b/argo/goldpinger/values.yaml
index 36a66d3..5bc894c 100644
--- a/argo/goldpinger/values.yaml
+++ b/argo/goldpinger/values.yaml
@@ -1,3 +1,11 @@
 ---
 service:
   type: ClusterIP
+
+istio:
+  name: goldpinger
+  namespace: goldpinger
+  commonName: goldpinger.teapot.masked.name
+  ingressSelector: ingressgateway-internal
+  issuer: vault-issuer
+  port: 80