diff --git a/apps/arr.yaml b/apps/arr.yaml
new file mode 100644
index 0000000..f03f886
--- /dev/null
+++ b/apps/arr.yaml
@@ -0,0 +1,20 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: arr
+  namespace: argocd
+  finalizers:
+    - resources-finalizer.argocd.argoproj.io
+spec:
+  project: default
+  source:
+    path: apps/arr
+    repoURL: https://github.com/vehagn/homelab
+    targetRevision: HEAD
+  destination:
+    namespace: arr
+    name: in-cluster
+  syncPolicy:
+    automated: {}
+    syncOptions:
+      - CreateNamespace=true
diff --git a/apps/arr/kustomization.yaml b/apps/arr/kustomization.yaml
index c2bc342..bfb87cd 100644
--- a/apps/arr/kustomization.yaml
+++ b/apps/arr/kustomization.yaml
@@ -3,7 +3,6 @@ kind: Kustomization
 namespace: arr
 
 resources:
-  - namespace.yaml
   - ingress.yaml
   - traefik-forward-auth
   - torrent
diff --git a/apps/arr/namespace.yaml b/apps/arr/namespace.yaml
deleted file mode 100644
index bb218a5..0000000
--- a/apps/arr/namespace.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: arr
diff --git a/apps/arr/traefik-forward-auth/kustomization.yaml b/apps/arr/traefik-forward-auth/kustomization.yaml
index b8c391f..01e7632 100644
--- a/apps/arr/traefik-forward-auth/kustomization.yaml
+++ b/apps/arr/traefik-forward-auth/kustomization.yaml
@@ -11,9 +11,4 @@ resources:
 configMapGenerator:
   - name: configs
     files:
-      - configs/traefik-forward-auth.ini
-
-secretGenerator:
-  - name: traefik-forward-auth-secrets
-    envs:
-      - secrets/traefik-forward-auth.env
\ No newline at end of file
+      - configs/traefik-forward-auth.ini
\ No newline at end of file
diff --git a/apps/home-assistant.yaml b/apps/home-assistant.yaml
index ca472f1..18db948 100644
--- a/apps/home-assistant.yaml
+++ b/apps/home-assistant.yaml
@@ -13,4 +13,8 @@ spec:
   source:
     path: apps/home-assistant
     repoURL: https://github.com/vehagn/homelab
-    targetRevision: HEAD
\ No newline at end of file
+    targetRevision: HEAD
+  syncPolicy:
+    automated: {}
+    syncOptions:
+      - CreateNamespace=true
diff --git a/apps/home-assistant/kustomization.yaml b/apps/home-assistant/kustomization.yaml
index 2c39c14..9db6b96 100644
--- a/apps/home-assistant/kustomization.yaml
+++ b/apps/home-assistant/kustomization.yaml
@@ -5,7 +5,6 @@ commonLabels:
   app: home-assistant
 
 resources:
-  - namespace.yaml
   - service.yaml
   - deployment.yaml
   - ingress.yaml
diff --git a/apps/home-assistant/namespace.yaml b/apps/home-assistant/namespace.yaml
deleted file mode 100644
index 7c1d06d..0000000
--- a/apps/home-assistant/namespace.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: home-assistant
diff --git a/apps/plex.yaml b/apps/plex.yaml
index e1bc6e5..32a0ce6 100644
--- a/apps/plex.yaml
+++ b/apps/plex.yaml
@@ -13,4 +13,8 @@ spec:
   source:
     path: apps/plex
     repoURL: https://github.com/vehagn/homelab
-    targetRevision: HEAD
\ No newline at end of file
+    targetRevision: HEAD
+  syncPolicy:
+    automated: {}
+    syncOptions:
+      - CreateNamespace=true
diff --git a/apps/plex/kustomization.yaml b/apps/plex/kustomization.yaml
index b8b1468..8d3b8bc 100644
--- a/apps/plex/kustomization.yaml
+++ b/apps/plex/kustomization.yaml
@@ -5,7 +5,6 @@ commonLabels:
   app: plex
 
 resources:
-  - namespace.yaml
   #  - pv.yaml
   #  - pvc.yaml
   - service.yaml
diff --git a/apps/plex/namespace.yaml b/apps/plex/namespace.yaml
deleted file mode 100644
index 10293c3..0000000
--- a/apps/plex/namespace.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: plex
\ No newline at end of file
diff --git a/apps/whoami.yaml b/apps/whoami.yaml
index b89d66e..bd83b03 100644
--- a/apps/whoami.yaml
+++ b/apps/whoami.yaml
@@ -15,7 +15,6 @@ spec:
     namespace: whoami
     name: in-cluster
   syncPolicy:
-    automated:
-      selfHeal: true
+    automated: {}
     syncOptions:
       - CreateNamespace=true
diff --git a/infra/argocd/applications.yaml b/infra/argocd/applications.yaml
index c6464eb..46a5397 100644
--- a/infra/argocd/applications.yaml
+++ b/infra/argocd/applications.yaml
@@ -6,14 +6,15 @@ metadata:
   finalizers:
     - resources-finalizer.argocd.argoproj.io
 spec:
-  destination:
-    namespace: applications
-    name: in-cluster
   project: default
   source:
     path: apps
     repoURL: https://github.com/vehagn/homelab
     targetRevision: HEAD
+  destination:
+    namespace: applications
+    name: in-cluster
   syncPolicy:
+    automated: {}
     syncOptions:
       - CreateNamespace=true
\ No newline at end of file
diff --git a/secrets/kustomization.yaml b/secrets/kustomization.yaml
index 005e1ac..ee10988 100644
--- a/secrets/kustomization.yaml
+++ b/secrets/kustomization.yaml
@@ -2,4 +2,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
+  - arr.yaml
   - whoami.yaml
\ No newline at end of file