diff --git a/appsets/appset.yaml b/appsets/appset.yaml
index 34716fd..707054d 100644
--- a/appsets/appset.yaml
+++ b/appsets/appset.yaml
@@ -25,7 +25,7 @@ spec:
               pathParamPrefix: values
   template:
     metadata:
-      name: '{{ base (replace .values.path.segments 2 ".yaml" "") }}-{{ index .chart.path.segments 1 }}'
+      name: '{{ base (replace .values.path ".yaml" "") }}-{{ index .chart.path.segments 1 }}'
       annotations:
         argocd.argoproj.io/manifest-generate-paths: ".;.."
       finalizers:
@@ -42,10 +42,10 @@ spec:
         helm:
           releaseName: '{{ index .chart.path.segments 1 }}'
           valueFiles:
-            - secrets+age-import:///helm-secrets-private-keys/key.txt?values/{{ index .chart.path.segments 1 }}/{{ base .values.path.segments 2 }}
+            - secrets+age-import:///helm-secrets-private-keys/key.txt?values/{{ index .chart.path.segments 1 }}/{{ base .values.path }}
       destination:
         name: in-cluster
-        namespace: '{{ base (replace .values.path.segments 2 ".yaml" "") }}-{{ index .chart.path.segments 1 }}'
+        namespace: '{{ base (replace .values.path ".yaml" "") }}-{{ index .chart.path.segments 1 }}'
       syncPolicy:
         automated:
           prune: true