diff --git a/k8s/state/core/argocd.yaml b/k8s/core/argocd/app.yaml
similarity index 100%
rename from k8s/state/core/argocd.yaml
rename to k8s/core/argocd/app.yaml
diff --git a/k8s/core/argocd/kustomization.yaml b/k8s/core/argocd/kustomization.yaml
index ec14a5c..a7aff1e 100644
--- a/k8s/core/argocd/kustomization.yaml
+++ b/k8s/core/argocd/kustomization.yaml
@@ -2,6 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
+  - app.yaml
   - ingress.yaml
 
 helmCharts:
diff --git a/k8s/state/core/cert-manager.yaml b/k8s/core/cert-manager/app.yaml
similarity index 100%
rename from k8s/state/core/cert-manager.yaml
rename to k8s/core/cert-manager/app.yaml
diff --git a/k8s/core/cert-manager/kustomization.yaml b/k8s/core/cert-manager/kustomization.yaml
index 892164f..6e02ee4 100644
--- a/k8s/core/cert-manager/kustomization.yaml
+++ b/k8s/core/cert-manager/kustomization.yaml
@@ -2,6 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
+  - app.yaml
   - external-secrets.yaml
   - issuer.yaml
 
diff --git a/k8s/state/core/external-secrets.yaml b/k8s/core/external-secrets/app.yaml
similarity index 100%
rename from k8s/state/core/external-secrets.yaml
rename to k8s/core/external-secrets/app.yaml
diff --git a/k8s/core/external-secrets/kustomization.yaml b/k8s/core/external-secrets/kustomization.yaml
index 6d2c406..e6c1363 100644
--- a/k8s/core/external-secrets/kustomization.yaml
+++ b/k8s/core/external-secrets/kustomization.yaml
@@ -2,6 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
+  - app.yaml
   - bitwarden-store.yaml
 
 helmCharts:
diff --git a/k8s/core/kubernetes-dashboard/kustomization.yaml b/k8s/core/kubernetes-dashboard/kustomization.yaml
index 69ec232..137e412 100644
--- a/k8s/core/kubernetes-dashboard/kustomization.yaml
+++ b/k8s/core/kubernetes-dashboard/kustomization.yaml
@@ -2,6 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
+  - app.yaml
   - service-account.yaml
 
 helmCharts:
diff --git a/k8s/state/core/postgresql.yaml b/k8s/core/postgresql/app.yaml
similarity index 100%
rename from k8s/state/core/postgresql.yaml
rename to k8s/core/postgresql/app.yaml
diff --git a/k8s/core/postgresql/kustomization.yaml b/k8s/core/postgresql/kustomization.yaml
index 280bf99..70c64d8 100644
--- a/k8s/core/postgresql/kustomization.yaml
+++ b/k8s/core/postgresql/kustomization.yaml
@@ -2,6 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
+  - app.yaml
   - external-secrets.yaml
   - main-db.yaml
   - nas-db.yaml
diff --git a/k8s/state/argo-project.yaml b/k8s/state/argo-project.yaml
deleted file mode 100644
index b75a73b..0000000
--- a/k8s/state/argo-project.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-apiVersion: argoproj.io/v1alpha1
-kind: AppProject
-metadata:
-  name: homelab
-  namespace: argocd
-spec:
-  description: Hexor Home Lab
-  sourceRepos:
-    - ssh://git@gt.hexor.cy:30022/ab/homelab.git
-  destinations:
-    - namespace: '*'
-      server: https://kubernetes.default.svc
-  clusterResourceWhitelist:
-    - group: '*'
-      kind: '*'
-
diff --git a/k8s/state/core/authentik.yaml b/k8s/state/core/authentik.yaml
deleted file mode 100644
index 9d06a32..0000000
--- a/k8s/state/core/authentik.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: authentik
-  namespace: argocd
-spec:
-  project: homelab
-  destination:
-    namespace: authentik
-    server: https://kubernetes.default.svc
-  source:
-    repoURL: ssh://git@gt.hexor.cy:30022/ab/homelab.git
-    targetRevision: HEAD
-    path: k8s/core/authentik
-  syncPolicy:
-    automated:
-      selfHeal: true
-      prune: true
-    syncOptions:
-      - CreateNamespace=true
-
diff --git a/k8s/state/core/k8s-dashboard.yaml b/k8s/state/core/k8s-dashboard.yaml
deleted file mode 100644
index ed073a0..0000000
--- a/k8s/state/core/k8s-dashboard.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: kubernetes-dashboard
-  namespace: argocd
-spec:
-  project: homelab
-  destination:
-    namespace: kubernetes-dashboard
-    server: https://kubernetes.default.svc
-  source:
-    repoURL: ssh://git@gt.hexor.cy:30022/ab/homelab.git
-    targetRevision: HEAD
-    path: k8s/core/kubernetes-dashboard
-  syncPolicy:
-    automated:
-      selfHeal: true
-      prune: true
-    syncOptions:
-      - CreateNamespace=true
-