diff --git a/env-sets/dev/applicationSet.yaml b/env-sets/dev/applicationSet.yaml
index 528b54d..06428d8 100644
--- a/env-sets/dev/applicationSet.yaml
+++ b/env-sets/dev/applicationSet.yaml
@@ -9,9 +9,7 @@ spec:
         repoURL: https://git.dvirlabs.com/dvirlabs/app-definition.git
         revision: HEAD
         files:
-          - path: services/svc-*.yaml
-        extract:
-          appname: '{{ index .path.segments 3 | trimSuffix ".yaml" }}'
+          - path: services/{{path.basename}}
   template:
     metadata:
       name: '{{ appname }}-dev'
diff --git a/env-sets/dev/services/svc-1.yaml b/env-sets/dev/services/svc-1/svc-1.yaml
similarity index 100%
rename from env-sets/dev/services/svc-1.yaml
rename to env-sets/dev/services/svc-1/svc-1.yaml
diff --git a/env-sets/dev/services/svc-2.yaml b/env-sets/dev/services/svc-2/svc-2.yaml
similarity index 100%
rename from env-sets/dev/services/svc-2.yaml
rename to env-sets/dev/services/svc-2/svc-2.yaml