diff --git a/apps/arr/common-values.yaml b/apps/arr/common-values.yaml
new file mode 100644
index 0000000..eae9799
--- /dev/null
+++ b/apps/arr/common-values.yaml
@@ -0,0 +1,11 @@
+namespace: arr
+env:
+  - name: PUID
+    value: "1000"
+  - name: PGID
+    value: "1000"
+  - name: TZ
+    value: Europe/Oslo
+auth:
+  enabled: true
+  create: false
diff --git a/apps/arr/kustomization.yaml b/apps/arr/kustomization.yaml
index fd47d24..885f677 100644
--- a/apps/arr/kustomization.yaml
+++ b/apps/arr/kustomization.yaml
@@ -8,4 +8,4 @@ resources:
   - prowlarr
   - sonarr
   - radarr
-  - lidarr.yaml
\ No newline at end of file
+  - lidarr.yaml
diff --git a/apps/arr/lidarr.yaml b/apps/arr/lidarr.yaml
index 43b4dbe..84c759f 100644
--- a/apps/arr/lidarr.yaml
+++ b/apps/arr/lidarr.yaml
@@ -8,13 +8,11 @@ metadata:
 spec:
   project: applications
   source:
-    path: helm/application
     repoURL: https://github.com/vehagn/homelab
-    targetRevision: HEAD
+    path: helm/application
     helm:
-      values: |
+      values: |-
         name: lidarr
-        namespace: arr
         image: 
           name: lscr.io/linuxserver/lidarr
         hostVolumes:
@@ -24,18 +22,10 @@ spec:
           - name: media-data
             hostPath: /disk/data
             mountPath: /app/data
-        env:
-          - name: PUID
-            value: "1000"
-          - name: PGID
-            value: "1000"
-          - name: TZ
-            value: Europe/Oslo
         service:
           containerPort: 8686
-        auth:
-          enabled: true
-          create: false
+      valueFiles:
+        - ../../apps/arr/common-values.yaml
   destination:
     namespace: arr
     name: in-cluster
diff --git a/apps/test.yaml b/apps/test.yaml
index ecb0f86..0e1866f 100644
--- a/apps/test.yaml
+++ b/apps/test.yaml
@@ -6,8 +6,10 @@ metadata:
   finalizers:
     - resources-finalizer.argocd.argoproj.io
 spec:
-  project: app-of-apps
+  project: applications
   source:
+    plugin:
+      name: kustomize-build-with-helm
     path: apps/test
     repoURL: https://github.com/vehagn/homelab
     targetRevision: HEAD
diff --git a/apps/test/app1.yaml b/apps/test/app1.yaml
index 375351a..b3fe789 100644
--- a/apps/test/app1.yaml
+++ b/apps/test/app1.yaml
@@ -1,27 +1,21 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: test-app1
+  name: app1
   namespace: argocd
   finalizers:
     - resources-finalizer.argocd.argoproj.io
 spec:
   project: applications
   source:
-    path: helm/application
     repoURL: https://github.com/vehagn/homelab
-    targetRevision: HEAD
+    path: helm/application
     helm:
-      values: |
+      values: |-
         name: app1
-        namespace: test
-        image: 
-          name: containous/whoami
-        service:
-          containerPort: 80
-        auth:
-          enabled: true
-          create: false
+        replicas: 3
+      valueFiles:
+        - ../../apps/test/common-values.yaml
   destination:
     namespace: test
     name: in-cluster
diff --git a/apps/test/app2.yaml b/apps/test/app2.yaml
index b1086a3..ca89efd 100644
--- a/apps/test/app2.yaml
+++ b/apps/test/app2.yaml
@@ -1,27 +1,23 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: test-app2
+  name: app2
   namespace: argocd
   finalizers:
     - resources-finalizer.argocd.argoproj.io
 spec:
   project: applications
-  source:
-    path: helm/application
-    repoURL: https://github.com/vehagn/homelab
-    targetRevision: HEAD
-    helm:
-      values: |
-        name: app2
-        namespace: test
-        image: 
-          name: containous/whoami
-        service:
-          containerPort: 80
-        auth:
-          enabled: true
-          create: false
+  sources:
+    - repoURL: https://github.com/vehagn/homelab
+      path: helm/application
+      helm:
+        parameters:
+          - name: name
+            value: app2
+        valueFiles:
+          - $values/apps/test/common-values.yaml
+    - repoURL: https://github.com/vehagn/homelab
+      ref: values
   destination:
     namespace: test
     name: in-cluster
diff --git a/apps/test/app3.yaml b/apps/test/app3.yaml
new file mode 100644
index 0000000..26af6d1
--- /dev/null
+++ b/apps/test/app3.yaml
@@ -0,0 +1,29 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: app3
+  namespace: argocd
+  finalizers:
+    - resources-finalizer.argocd.argoproj.io
+spec:
+  project: applications
+  sources:
+    - repoURL: https://github.com/vehagn/homelab
+      path: helm/application
+      helm:
+        parameters:
+          - name: name
+            value: app3
+        valueFiles:
+          - $values/apps/test/common-values.yaml
+    - repoURL: https://github.com/vehagn/homelab
+      ref: values
+  destination:
+    namespace: test
+    name: in-cluster
+  syncPolicy:
+    automated:
+      selfHeal: true
+      prune: true
+    syncOptions:
+      - CreateNamespace=true
diff --git a/apps/test/auth-values.yaml b/apps/test/auth-values.yaml
new file mode 100644
index 0000000..1db315c
--- /dev/null
+++ b/apps/test/auth-values.yaml
@@ -0,0 +1,8 @@
+name: auth
+namespace: test
+authOnly: true
+auth:
+  host: auth-test
+  whitelist:
+    - veghag@gmail.com
+    - wiredmatrices@gmail.com
diff --git a/apps/test/auth.yaml b/apps/test/auth.yaml
index f8bc92c..2c62a96 100644
--- a/apps/test/auth.yaml
+++ b/apps/test/auth.yaml
@@ -1,26 +1,20 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: test-auth
+  name: auth
   namespace: argocd
   finalizers:
     - resources-finalizer.argocd.argoproj.io
 spec:
   project: applications
-  source:
-    path: helm/application
-    repoURL: https://github.com/vehagn/homelab
-    targetRevision: HEAD
-    helm:
-      values: |
-        name: test-auth
-        namespace: test
-        authOnly: true
-        auth:
-          host: auth-test
-          whitelist:
-            - veghag@gmail.com
-            - wiredmatrices@gmail.com
+  sources:
+    - repoURL: https://github.com/vehagn/homelab
+      path: helm/application
+      helm:
+        valueFiles:
+          - $values/apps/test/auth-values.yaml
+    - repoURL: https://github.com/vehagn/homelab
+      ref: values
   destination:
     namespace: test
     name: in-cluster
diff --git a/apps/test/common-values.yaml b/apps/test/common-values.yaml
new file mode 100644
index 0000000..690a6c5
--- /dev/null
+++ b/apps/test/common-values.yaml
@@ -0,0 +1,9 @@
+name: app
+namespace: test
+image:
+  name: containous/whoami
+service:
+  containerPort: 80
+auth:
+  enabled: true
+  create: false
\ No newline at end of file
diff --git a/apps/test/kustomization.yaml b/apps/test/kustomization.yaml
index 0713db2..3f686fc 100644
--- a/apps/test/kustomization.yaml
+++ b/apps/test/kustomization.yaml
@@ -4,4 +4,18 @@ kind: Kustomization
 resources:
   - app1.yaml
   - app2.yaml
-  - auth.yaml
\ No newline at end of file
+  - app3.yaml
+  - auth.yaml
+
+#helmGlobals:
+#  chartHome: ../../helm
+#
+#helmCharts:
+#  - name: application
+#    valuesFile: auth.yaml
+#  - name: application
+#    valuesFile: app1.yaml
+#  - name: application
+#    valuesFile: app2.yaml
+#  - name: application
+#    valuesFile: app3.yaml