diff --git a/apps/kustomization.yaml b/apps/kustomization.yaml
new file mode 100644
index 0000000..7d5929f
--- /dev/null
+++ b/apps/kustomization.yaml
@@ -0,0 +1,10 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: argocd
+commonLabels:
+  dev.stonegarden: app-management
+  app.kubernetes.io/managed-by: argocd
+
+resources:
+  - project.yaml
+  - application-set.yaml
diff --git a/apps/project.yaml b/apps/project.yaml
new file mode 100644
index 0000000..36390d5
--- /dev/null
+++ b/apps/project.yaml
@@ -0,0 +1,30 @@
+apiVersion: argoproj.io/v1alpha1
+kind: AppProject
+metadata:
+  name: applications
+  namespace: argocd
+spec:
+  sourceNamespaces:
+    - '*'
+  sourceRepos:
+    - 'https://github.com/vehagn/*'
+  destinations:
+    - namespace: 'argocd'
+      server: '*'
+    - namespace: 'arr'
+      server: '*'
+    - namespace: 'blog'
+      server: '*'
+    - namespace: 'home-assistant'
+      server: '*'
+    - namespace: 'plex'
+      server: '*'
+    - namespace: 'stonegarden'
+      server: '*'
+    - namespace: 'whoami'
+      server: '*'
+    - namespace: 'test'
+      server: '*'
+  clusterResourceWhitelist:
+    - group: '*'
+      kind: '*'
\ No newline at end of file
diff --git a/infra/kustomization.yaml b/infra/kustomization.yaml
new file mode 100644
index 0000000..f846fb6
--- /dev/null
+++ b/infra/kustomization.yaml
@@ -0,0 +1,10 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: argocd
+commonLabels:
+  dev.stonegarden: infra-management
+  app.kubernetes.io/managed-by: argocd
+
+resources:
+  - project.yaml
+  - application-set.yaml
\ No newline at end of file
diff --git a/infra/project.yaml b/infra/project.yaml
new file mode 100644
index 0000000..4e8ad37
--- /dev/null
+++ b/infra/project.yaml
@@ -0,0 +1,29 @@
+apiVersion: argoproj.io/v1alpha1
+kind: AppProject
+metadata:
+  name: infrastructure
+  namespace: argocd
+spec:
+  sourceRepos:
+    - 'https://github.com/vehagn/homelab'
+    - 'https://prometheus-community.github.io/helm-charts'
+    - 'https://helm.traefik.io/*'
+    - 'https://helm.cilium.io/*'
+  destinations:
+    - namespace: 'argocd'
+      server: '*'
+    - namespace: 'cert-manager'
+      server: '*'
+    - namespace: 'kubernetes-dashboard'
+      server: '*'
+    - namespace: 'metallb-system'
+      server: '*'
+    - namespace: 'monitoring'
+      server: '*'
+    - namespace: 'traefik-system'
+      server: '*'
+    - namespace: 'kube-system'
+      server: '*'
+  clusterResourceWhitelist:
+    - group: '*'
+      kind: '*'
\ No newline at end of file
diff --git a/sets/applications.yaml b/sets/applications.yaml
index 6b6f8a0..31d2336 100644
--- a/sets/applications.yaml
+++ b/sets/applications.yaml
@@ -1,33 +1,4 @@
 apiVersion: argoproj.io/v1alpha1
-kind: AppProject
-metadata:
-  name: applications
-  namespace: argocd
-spec:
-  sourceNamespaces:
-    - '*'
-  sourceRepos:
-    - 'https://github.com/vehagn/*'
-  destinations:
-    - namespace: 'argocd'
-      server: '*'
-    - namespace: 'arr'
-      server: '*'
-    - namespace: 'home-assistant'
-      server: '*'
-    - namespace: 'plex'
-      server: '*'
-    - namespace: 'stonegarden'
-      server: '*'
-    - namespace: 'whoami'
-      server: '*'
-    - namespace: 'test'
-      server: '*'
-  clusterResourceWhitelist:
-    - group: '*'
-      kind: '*'
----
-apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
   name: applications
diff --git a/sets/infrastructure.yaml b/sets/infrastructure.yaml
index 39fac00..2694461 100644
--- a/sets/infrastructure.yaml
+++ b/sets/infrastructure.yaml
@@ -1,34 +1,4 @@
 apiVersion: argoproj.io/v1alpha1
-kind: AppProject
-metadata:
-  name: infrastructure
-  namespace: argocd
-spec:
-  sourceRepos:
-    - 'https://github.com/vehagn/homelab'
-    - 'https://prometheus-community.github.io/helm-charts'
-    - 'https://helm.traefik.io/*'
-    - 'https://helm.cilium.io/*'
-  destinations:
-    - namespace: 'argocd'
-      server: '*'
-    - namespace: 'cert-manager'
-      server: '*'
-    - namespace: 'kubernetes-dashboard'
-      server: '*'
-    - namespace: 'metallb-system'
-      server: '*'
-    - namespace: 'monitoring'
-      server: '*'
-    - namespace: 'traefik-system'
-      server: '*'
-    - namespace: 'kube-system'
-      server: '*'
-  clusterResourceWhitelist:
-    - group: '*'
-      kind: '*'
----
-apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
   name: infrastructure