diff --git a/env-sets/dev/applicationSet.yaml b/env-sets/dev/applicationSet.yaml
index 4fb260a..39faf0b 100644
--- a/env-sets/dev/applicationSet.yaml
+++ b/env-sets/dev/applicationSet.yaml
@@ -11,23 +11,19 @@ spec:
         files:
           - path: env-sets/dev/services/*.yaml
         extract:
-          appname: '{{ index .path.segments 4 | trimSuffix ".yaml" }}'
+          appname: '{{ index .path.segments 4 | trimSuffix ".yaml" | lower | regexReplaceAll "[^a-z0-9-]+" "-" | trimAll "-" }}'
   template:
     metadata:
       name: '{{appname}}-dev'
     spec:
       project: default
-      source:
-        repoURL: https://git.dvirlabs.com/dvirlabs/app-definition.git
-        targetRevision: HEAD
-        path: env-sets/dev/services
-        helm:
-          valueFiles:
-            - '{{appname}}.yaml'
       destination:
         server: https://kubernetes.default.svc
         namespace: dev
-      syncPolicy:
-        automated:
-          selfHeal: true
-          prune: true
+      source:
+        repoURL: https://git.dvirlabs.com/dvirlabs/app-definition.git
+        targetRevision: HEAD
+        path: charts/{{appname}}
+        helm:
+          valueFiles:
+            - env-sets/dev/services/{{appname}}.yaml