diff --git a/env-sets/dev/applicationSet.yaml b/env-sets/dev/applicationSet.yaml
index 0b2a5bd..d5deaaf 100644
--- a/env-sets/dev/applicationSet.yaml
+++ b/env-sets/dev/applicationSet.yaml
@@ -12,7 +12,7 @@ spec:
           - path: env-sets/dev/services/*.yaml
   template:
     metadata:
-      name: '{{ path.basename }}-dev'
+      name: '{{service.name}}-dev'
     spec:
       project: sandbox
       destination:
@@ -24,7 +24,7 @@ spec:
           path: nginx-message
           helm:
             valueFiles:
-              - $values/env-sets/dev/services/{{ path.basename }}.yaml
+              - $values/env-sets/dev/services/{{service.name}}.yaml
         - repoURL: https://git.dvirlabs.com/dvirlabs/app-definition.git
           targetRevision: HEAD
           ref: values