diff --git a/env-sets/int/applicationSet.yaml b/env-sets/int/applicationSet.yaml
index 8b64739..725f8b7 100644
--- a/env-sets/int/applicationSet.yaml
+++ b/env-sets/int/applicationSet.yaml
@@ -9,23 +9,26 @@ spec:
         repoURL: https://git.dvirlabs.com/dvirlabs/app-definition.git
         revision: HEAD
         files:
-          - path: env-sets/int/services/*.yaml
+          - path: env-sets/int/services/*/service.yaml
   template:
     metadata:
-      name: int-{{basenameNormalized}}
+      name: '{{ path.basename }}-int'
     spec:
-      project: default
-      source:
-        repoURL: https://git.dvirlabs.com/dvirlabs/app-provision.git
-        targetRevision: HEAD
-        chart: ngnix-message
-        helm:
-          valueFiles:
-            - services/{{path.basename}}     # ✅ correct relative path to value files
+      project: sandbox
       destination:
         server: https://kubernetes.default.svc
         namespace: int
+      sources:
+      - repoURL: https://git.dvirlabs.com/dvirlabs/app-provision.git
+        targetRevision: HEAD
+        path: ngnix-message
+        helm:
+          valueFiles:
+            - '$values/{{ .path.path }}/service.yaml'
+      - repoURL: https://git.dvirlabs.com/dvirlabs/app-definition.git
+        targetRevision: HEAD
+        ref: values
       syncPolicy:
         automated:
-          selfHeal: true
           prune: true
+          selfHeal: true
diff --git a/env-sets/prod/applicationSet.yaml b/env-sets/prod/applicationSet.yaml
index b193da0..25aa155 100644
--- a/env-sets/prod/applicationSet.yaml
+++ b/env-sets/prod/applicationSet.yaml
@@ -9,23 +9,26 @@ spec:
         repoURL: https://git.dvirlabs.com/dvirlabs/app-definition.git
         revision: HEAD
         files:
-          - path: env-sets/prod/services/*.yaml
+          - path: env-sets/prod/services/*/service.yaml
   template:
     metadata:
-      name: prod-{{basenameNormalized}}
+      name: '{{ path.basename }}-prod'
     spec:
-      project: default
-      source:
-        repoURL: https://git.dvirlabs.com/dvirlabs/app-provision.git
-        targetRevision: HEAD
-        chart: ngnix-message
-        helm:
-          valueFiles:
-            - services/{{path.basename}}     # ✅ correct relative path to value files
+      project: sandbox
       destination:
         server: https://kubernetes.default.svc
         namespace: prod
+      sources:
+      - repoURL: https://git.dvirlabs.com/dvirlabs/app-provision.git
+        targetRevision: HEAD
+        path: ngnix-message
+        helm:
+          valueFiles:
+            - '$values/{{ .path.path }}/service.yaml'
+      - repoURL: https://git.dvirlabs.com/dvirlabs/app-definition.git
+        targetRevision: HEAD
+        ref: values
       syncPolicy:
         automated:
-          selfHeal: true
           prune: true
+          selfHeal: true