diff --git a/env-sets/dev/applicationSet.yaml b/env-sets/dev/applicationSet.yaml
index 15cebce..06428d8 100644
--- a/env-sets/dev/applicationSet.yaml
+++ b/env-sets/dev/applicationSet.yaml
@@ -9,10 +9,10 @@ spec:
         repoURL: https://git.dvirlabs.com/dvirlabs/app-definition.git
         revision: HEAD
         files:
-          - path: env-sets/dev/services/svc-*.yaml  # סורק כל svc-*.yaml
+          - path: services/{{path.basename}}
   template:
     metadata:
-      name: '{{ path.basename | replace ".yaml" "" | replace "_" "-" | replace "." "-" | lower }}-dev'
+      name: '{{ appname }}-dev'
     spec:
       project: sandbox
       destination:
@@ -24,7 +24,7 @@ spec:
         path: ngnix-message
         helm:
           valueFiles:
-            - env-sets/dev/services/{{path.basename}}  # שימוש בקובץ הנוכחי
+            - 'services/svc-*.yaml'
       syncPolicy:
         automated:
           prune: true
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