diff --git a/env-sets/dev/applicationSet.yaml b/env-sets/dev/applicationSet.yaml
index 1ddda51..94fb728 100644
--- a/env-sets/dev/applicationSet.yaml
+++ b/env-sets/dev/applicationSet.yaml
@@ -10,9 +10,11 @@ spec:
         revision: HEAD
         files:
           - path: env-sets/dev/services/*/svc-*.yaml
+        extract:
+          service: '{{ index .path.segments 4 }}'
   template:
     metadata:
-      name: '{{ path.basename }}-dev'
+      name: '{{ service }}-dev'
     spec:
       project: sandbox
       destination:
@@ -24,10 +26,7 @@ spec:
           path: nginx-message
           helm:
             valueFiles:
-              - $values/env-sets/dev/services/{{ path.basename }}.yaml
+              - $values/env-sets/dev/services/{{ service }}/svc-{{ service }}.yaml
         - repoURL: https://git.dvirlabs.com/dvirlabs/app-definition.git
           targetRevision: HEAD
           ref: values
-      syncPolicy: {}
-        # automated:
-        #   selfHeal: true
\ No newline at end of file