diff --git a/apps/arr/auth.yaml b/apps/arr/auth.yaml
deleted file mode 100644
index 2f7bdd2..0000000
--- a/apps/arr/auth.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: auth-arr
-  namespace: argocd
-  finalizers:
-    - resources-finalizer.argocd.argoproj.io
-spec:
-  project: applications
-  source:
-    repoURL: https://github.com/vehagn/homelab
-    path: charts/application
-    helm:
-      values: |-
-        name: auth
-        namespace: arr
-        authOnly: true
-        auth:
-          cookieDomain: stonegarden.dev
-          whitelist:
-            - veghag@gmail.com
-  destination:
-    namespace: arr
-    name: in-cluster
-  syncPolicy:
-    automated:
-      selfHeal: true
-      prune: true
-    syncOptions:
-      - CreateNamespace=true
diff --git a/apps/arr/cm-common-env.yaml b/apps/arr/cm-common-env.yaml
deleted file mode 100644
index 8657fde..0000000
--- a/apps/arr/cm-common-env.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: common-env
-  namespace: arr
-data:
-  PUID: "1000"
-  PGID: "1000"
-  UMASK: "002"
-  TZ: "Europe/Oslo"
diff --git a/apps/arr/kustomization.yaml b/apps/arr/kustomization.yaml
index ead35ee..19af972 100644
--- a/apps/arr/kustomization.yaml
+++ b/apps/arr/kustomization.yaml
@@ -1,14 +1,106 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
+namespace: arr
 commonLabels:
   app.kubernetes.io/part-of: arr
   app.kubernetes.io/managed-by: argocd
 
-resources:
-  - cm-common-env.yaml
-  - auth.yaml
-  - torrent.yaml
-  - prowlarr.yaml
-  - sonarr.yaml
-  - radarr.yaml
-  - lidarr.yaml
\ No newline at end of file
+configMapGenerator:
+  - name: common-env
+    literals:
+      - PUID="1000"
+      - PGID="1000"
+      - UMASK="002"
+      - TZ="Europe/Oslo"
+
+helmGlobals:
+  chartHome: ../../charts
+
+helmCharts:
+  - name: application
+    releaseName: auth
+    valuesFile: common-values.yaml
+    valuesInline:
+      name: auth
+      namespace: arr
+      authOnly: true
+      auth:
+        cookieDomain: stonegarden.dev
+        whitelist:
+          - veghag@gmail.com
+  - name: application
+    releaseName: lidarr
+    valuesFile: common-values.yaml
+    valuesInline:
+      name: lidarr
+      image:
+        name: lscr.io/linuxserver/lidarr
+      hostVolumes:
+        - name: lidarr-config
+          hostPath: /disk/etc/lidarr
+          mountPath: /config
+      service:
+        containerPort: 8686
+  - name: application
+    releaseName: prowlarr
+    valuesFile: common-values.yaml
+    valuesInline:
+      name: prowlarr
+      image:
+        name: lscr.io/linuxserver/prowlarr
+      hostVolumes:
+        - name: prowlarr-config
+          hostPath: /disk/etc/prowlarr
+          mountPath: /config
+      additionalVolumes: []
+      service:
+        containerPort: 9696
+  - name: application
+    releaseName: radarr
+    valuesFile: common-values.yaml
+    valuesInline:
+      name: radarr
+      image:
+        name: lscr.io/linuxserver/radarr
+      hostVolumes:
+        - name: radarr-config
+          hostPath: /disk/etc/radarr
+          mountPath: /config
+      service:
+        containerPort: 7878
+  - name: application
+    releaseName: sonarr
+    valuesFile: common-values.yaml
+    valuesInline:
+      name: sonarr
+      image:
+        name: lscr.io/linuxserver/sonarr
+      hostVolumes:
+        - name: sonarr-config
+          hostPath: /disk/etc/sonarr
+          mountPath: /config
+      service:
+        containerPort: 8989
+  - name: application
+    releaseName: torrent
+    valuesFile: common-values.yaml
+    valuesInline:
+      name: torrent
+      image:
+        name: cr.hotio.dev/hotio/qbittorrent
+      hostVolumes:
+        - name: torrent-config
+          hostPath: /disk/etc/qbittorrent
+          mountPath: /config
+      service:
+        type: LoadBalancer
+        containerPort: 8080
+        additionalPorts:
+          - name: tcp
+            protocol: TCP
+            containerPort: 11011
+          - name: udp
+            protocol: UDP
+            containerPort: 11011
+
+
diff --git a/apps/arr/lidarr.yaml b/apps/arr/lidarr.yaml
deleted file mode 100644
index b13c5f9..0000000
--- a/apps/arr/lidarr.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: lidarr
-  namespace: argocd
-  finalizers:
-    - resources-finalizer.argocd.argoproj.io
-spec:
-  project: applications
-  source:
-    repoURL: https://github.com/vehagn/homelab
-    path: charts/application
-    helm:
-      values: |-
-        name: lidarr
-        image: 
-          name: lscr.io/linuxserver/lidarr
-        hostVolumes:
-          - name: lidarr-config
-            hostPath: /disk/etc/lidarr
-            mountPath: /config
-        service:
-          containerPort: 8686
-      valueFiles:
-        - ../../apps/arr/common-values.yaml
-  destination:
-    namespace: arr
-    name: in-cluster
-  syncPolicy:
-    automated:
-      selfHeal: true
-      prune: true
-    syncOptions:
-      - CreateNamespace=true
diff --git a/apps/arr/prowlarr.yaml b/apps/arr/prowlarr.yaml
deleted file mode 100644
index fa09fbe..0000000
--- a/apps/arr/prowlarr.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: prowlarr
-  namespace: argocd
-  finalizers:
-    - resources-finalizer.argocd.argoproj.io
-spec:
-  project: applications
-  source:
-    repoURL: https://github.com/vehagn/homelab
-    path: charts/application
-    helm:
-      values: |-
-        name: prowlarr
-        image: 
-          name: lscr.io/linuxserver/prowlarr
-        hostVolumes:
-          - name: prowlarr-config
-            hostPath: /disk/etc/prowlarr
-            mountPath: /config
-        additionalVolumes: []
-        service:
-          containerPort: 9696
-      valueFiles:
-        - ../../apps/arr/common-values.yaml
-  destination:
-    namespace: arr
-    name: in-cluster
-  syncPolicy:
-    automated:
-      selfHeal: true
-      prune: true
-    syncOptions:
-      - CreateNamespace=true
diff --git a/apps/arr/radarr.yaml b/apps/arr/radarr.yaml
deleted file mode 100644
index 0daab99..0000000
--- a/apps/arr/radarr.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: radarr
-  namespace: argocd
-  finalizers:
-    - resources-finalizer.argocd.argoproj.io
-spec:
-  project: applications
-  source:
-    repoURL: https://github.com/vehagn/homelab
-    path: charts/application
-    helm:
-      values: |-
-        name: radarr
-        image: 
-          name: lscr.io/linuxserver/radarr
-        hostVolumes:
-          - name: radarr-config
-            hostPath: /disk/etc/radarr
-            mountPath: /config
-        service:
-          containerPort: 7878
-      valueFiles:
-        - ../../apps/arr/common-values.yaml
-  destination:
-    namespace: arr
-    name: in-cluster
-  syncPolicy:
-    automated:
-      selfHeal: true
-      prune: true
-    syncOptions:
-      - CreateNamespace=true
diff --git a/apps/arr/sonarr.yaml b/apps/arr/sonarr.yaml
deleted file mode 100644
index 6a9e5d7..0000000
--- a/apps/arr/sonarr.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: sonarr
-  namespace: argocd
-  finalizers:
-    - resources-finalizer.argocd.argoproj.io
-spec:
-  project: applications
-  source:
-    repoURL: https://github.com/vehagn/homelab
-    path: charts/application
-    helm:
-      values: |-
-        name: sonarr
-        image: 
-          name: lscr.io/linuxserver/sonarr
-        hostVolumes:
-          - name: sonarr-config
-            hostPath: /disk/etc/sonarr
-            mountPath: /config
-        service:
-          containerPort: 8989
-      valueFiles:
-        - ../../apps/arr/common-values.yaml
-  destination:
-    namespace: arr
-    name: in-cluster
-  syncPolicy:
-    automated:
-      selfHeal: true
-      prune: true
-    syncOptions:
-      - CreateNamespace=true
diff --git a/apps/arr/torrent.yaml b/apps/arr/torrent.yaml
deleted file mode 100644
index 070c803..0000000
--- a/apps/arr/torrent.yaml
+++ /dev/null
@@ -1,43 +0,0 @@
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: torrent
-  namespace: argocd
-  finalizers:
-    - resources-finalizer.argocd.argoproj.io
-spec:
-  project: applications
-  source:
-    repoURL: https://github.com/vehagn/homelab
-    path: charts/application
-    targetRevision: HEAD
-    helm:
-      values: |-
-        name: torrent
-        image: 
-          name: cr.hotio.dev/hotio/qbittorrent
-        hostVolumes:
-          - name: torrent-config
-            hostPath: /disk/etc/qbittorrent
-            mountPath: /config
-        service:
-          type: LoadBalancer
-          containerPort: 8080
-          additionalPorts:
-            - name: tcp
-              protocol: TCP
-              containerPort: 11011
-            - name: udp
-              protocol: UDP
-              containerPort: 11011
-      valueFiles:
-        - ../../apps/arr/common-values.yaml
-  destination:
-    namespace: arr
-    name: in-cluster
-  syncPolicy:
-    automated:
-      selfHeal: true
-      prune: true
-    syncOptions:
-      - CreateNamespace=true