diff --git a/kluster-deployments/argocd-imageupdate/application.yaml b/kluster-deployments/argocd-imageupdate/application.yaml
index 0a7df39..a267e2b 100644
--- a/kluster-deployments/argocd-imageupdate/application.yaml
+++ b/kluster-deployments/argocd-imageupdate/application.yaml
@@ -11,7 +11,7 @@ metadata:
     argocd-image-updater.argoproj.io/write-back-method: git
 
 spec:
-  project: default
+  project: infrastructure
   source:
     repoURL: https://github.com/moll-re/k3s-infra.git
     targetRevision: main
diff --git a/kluster-deployments/backup/backup.application.yaml b/kluster-deployments/backup/backup.application.yaml
index c004ef4..c5fd5db 100644
--- a/kluster-deployments/backup/backup.application.yaml
+++ b/kluster-deployments/backup/backup.application.yaml
@@ -4,7 +4,7 @@ metadata:
   name: restic-backup-application
   namespace: argocd
 spec:
-  project: default
+  project: infrastructure
   source:
     repoURL: https://github.com/moll-re/k3s-infra.git
     targetRevision: main
diff --git a/kluster-deployments/backup/prune.application.yaml b/kluster-deployments/backup/prune.application.yaml
index 45a980d..5aaba96 100644
--- a/kluster-deployments/backup/prune.application.yaml
+++ b/kluster-deployments/backup/prune.application.yaml
@@ -4,7 +4,7 @@ metadata:
   name: restic-prune-application
   namespace: argocd
 spec:
-  project: default
+  project: infrastructure
   source:
     repoURL: https://github.com/moll-re/k3s-infra.git
     targetRevision: main
diff --git a/kluster-deployments/backup/secrets.application.yaml b/kluster-deployments/backup/secrets.application.yaml
index 16599f2..7f2633e 100644
--- a/kluster-deployments/backup/secrets.application.yaml
+++ b/kluster-deployments/backup/secrets.application.yaml
@@ -4,7 +4,7 @@ metadata:
   name: restic-secrets-application
   namespace: argocd
 spec:
-  project: default
+  project: infrastructure
   source:
     repoURL: https://github.com/moll-re/k3s-infra.git
     targetRevision: main
diff --git a/kluster-deployments/homeassistant/application.yaml b/kluster-deployments/homeassistant/application.yaml
index 60ed3a4..4725d86 100644
--- a/kluster-deployments/homeassistant/application.yaml
+++ b/kluster-deployments/homeassistant/application.yaml
@@ -4,7 +4,7 @@ metadata:
   name: homeassistant-application
   namespace: argocd
 spec:
-  project: default
+  project: apps
   source:
     repoURL: https://github.com/moll-re/k3s-infra.git
     targetRevision: HEAD
diff --git a/kluster-deployments/immich/application.yaml b/kluster-deployments/immich/application.yaml
index 85fe4be..2d28036 100644
--- a/kluster-deployments/immich/application.yaml
+++ b/kluster-deployments/immich/application.yaml
@@ -7,7 +7,7 @@ metadata:
     argocd-image-updater.argoproj.io/image-list: ghcr.io/immich-app/immich-server # no version constraints, use newest
     argocd-image-updater.argoproj.io/write-back-method: declarative # write back to git
 spec:
-  project: default
+  project: apps
   sources:
     - chart: immich
       repoURL: https://immich-app.github.io/immich-charts
diff --git a/kluster-deployments/journal/application.yaml b/kluster-deployments/journal/application.yaml
index 8140a2c..1c4378e 100644
--- a/kluster-deployments/journal/application.yaml
+++ b/kluster-deployments/journal/application.yaml
@@ -11,10 +11,10 @@ metadata:
     argocd-image-updater.argoproj.io/write-back-method: git:secret:argocd/journal-repo
 
 spec:
-  project: default
+  project: apps
   source:
     repoURL: ssh://git@git.kluster.moll.re:2222/remoll/journal-bot.git
-    targetRevision: HEAD
+    targetRevision: main
     path: deployment/
   destination:
     server: https://kubernetes.default.svc
diff --git a/kluster-deployments/kustomization.yaml b/kluster-deployments/kustomization.yaml
index ad8f91d..056da08 100644
--- a/kluster-deployments/kustomization.yaml
+++ b/kluster-deployments/kustomization.yaml
@@ -5,11 +5,13 @@ namespace: argocd
 
 
 resources:
+  - projects.yaml
+  - nfs/
+  - backup/
   - argocd-imageupdate/
   - whoami/
   - journal/
   - immich/
   - homeassistant/
   - ntfy/
-  - backup/
   - rss/
diff --git a/kluster-deployments/nfs/application.yaml b/kluster-deployments/nfs/application.yaml
new file mode 100644
index 0000000..15060ec
--- /dev/null
+++ b/kluster-deployments/nfs/application.yaml
@@ -0,0 +1,18 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: nfs-provisioner-application
+  namespace: argocd
+spec:
+  project: infrastructure
+  source:
+    repoURL: https://github.com/moll-re/k3s-infra.git
+    targetRevision: main
+    path: infrastructure/nfs/
+  destination:
+    server: https://kubernetes.default.svc
+    namespace: nfs-provisioner
+  syncPolicy:
+    automated:
+      prune: true
+      selfHeal: true
\ No newline at end of file
diff --git a/kluster-deployments/nfs/kustomization.yaml b/kluster-deployments/nfs/kustomization.yaml
new file mode 100644
index 0000000..1f43d0d
--- /dev/null
+++ b/kluster-deployments/nfs/kustomization.yaml
@@ -0,0 +1,4 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+- application.yaml
diff --git a/kluster-deployments/ntfy/application.yaml b/kluster-deployments/ntfy/application.yaml
index aa65ab3..75aef74 100644
--- a/kluster-deployments/ntfy/application.yaml
+++ b/kluster-deployments/ntfy/application.yaml
@@ -5,7 +5,7 @@ metadata:
   namespace: argocd
 
 spec:
-  project: default
+  project: apps
   source:
     repoURL: https://github.com/moll-re/k3s-infra.git
     targetRevision: main
diff --git a/kluster-deployments/projects.yaml b/kluster-deployments/projects.yaml
new file mode 100644
index 0000000..809b52c
--- /dev/null
+++ b/kluster-deployments/projects.yaml
@@ -0,0 +1,31 @@
+apiVersion: argoproj.io/v1alpha1
+kind: AppProject
+metadata:
+  name: infrastructure
+  namespace: argocd
+  # Finalizer that ensures that project is not deleted until it is not referenced by any application
+  finalizers:
+    - resources-finalizer.argocd.argoproj.io
+spec:
+  # Project description
+  description: Infrastructure applications
+
+  # Allow manifests to deploy from any Git repos
+  sourceRepos:
+  - '*'
+---
+apiVersion: argoproj.io/v1alpha1
+kind: AppProject
+metadata:
+  name: apps
+  namespace: argocd
+  # Finalizer that ensures that project is not deleted until it is not referenced by any application
+  finalizers:
+    - resources-finalizer.argocd.argoproj.io
+spec:
+  # Project description
+  description: Infrastructure applications
+
+  # Allow manifests to deploy from any Git repos
+  sourceRepos:
+  - '*'
\ No newline at end of file
diff --git a/kluster-deployments/rss/application.yaml b/kluster-deployments/rss/application.yaml
index 64828bb..c9d14a3 100644
--- a/kluster-deployments/rss/application.yaml
+++ b/kluster-deployments/rss/application.yaml
@@ -5,7 +5,7 @@ metadata:
   namespace: argocd
 
 spec:
-  project: default
+  project: apps
   source:
     repoURL: https://github.com/moll-re/k3s-infra.git
     targetRevision: main
diff --git a/kluster-deployments/whoami/application.yaml b/kluster-deployments/whoami/application.yaml
index 75a4ddb..3663524 100644
--- a/kluster-deployments/whoami/application.yaml
+++ b/kluster-deployments/whoami/application.yaml
@@ -4,10 +4,10 @@ metadata:
   name: whoami-application
   namespace: argocd
 spec:
-  project: default
+  project: apps
   source:
     repoURL: https://github.com/moll-re/k3s-infra.git
-    targetRevision: HEAD
+    targetRevision: main
     path: apps/whoami/overlays/main
   destination:
     server: https://kubernetes.default.svc