diff --git a/external-secrets/argocd.yaml b/external-secrets/argocd.yaml
index 4667779..9b44ff1 100644
--- a/external-secrets/argocd.yaml
+++ b/external-secrets/argocd.yaml
@@ -4,43 +4,38 @@ metadata:
   name: external-secrets
   namespace: argocd
   finalizers:
-    - resources-finalizer.argocd.argoproj.io
+  - resources-finalizer.argocd.argoproj.io
 spec:
   project: default
-
   sources:
-    # Helm chart from external repository
-    - repoURL: https://charts.external-secrets.io
-      chart: external-secrets
-      targetRevision: 0.10.5
-      helm:
-        valueFiles:
-          - $values/external-secrets/helm-values.yaml
-    # Values file from Git repository
-    - repoURL: https://gitea0213.kro.kr/bluemayne/cluster-infrastructure.git
-      targetRevision: main
-      ref: values
-
+  - repoURL: https://charts.external-secrets.io
+    chart: external-secrets
+    targetRevision: 0.10.5
+    helm:
+      valueFiles:
+      - $values/external-secrets/helm-values.yaml
+  - repoURL: https://gitea0213.kro.kr/bluemayne/cluster-infrastructure.git
+    targetRevision: main
+    ref: values
   destination:
     server: https://kubernetes.default.svc
     namespace: external-secrets
-
   syncPolicy:
     automated:
       prune: true
       selfHeal: true
       allowEmpty: false
-
     syncOptions:
-      - CreateNamespace=true
-      - PrunePropagationPolicy=foreground
-      - PruneLast=true
-
+    - CreateNamespace=true
+    - PrunePropagationPolicy=foreground
+    - PruneLast=true
     retry:
       limit: 5
       backoff:
         duration: 5s
         factor: 2
         maxDuration: 3m
-
+    managedNamespaceMetadata:
+      labels:
+        goldilocks.fairwinds.com/enabled: 'true'
   revisionHistoryLimit: 10
diff --git a/external-secrets/kustomization.yaml b/external-secrets/kustomization.yaml
index dca4a51..b83b23e 100644
--- a/external-secrets/kustomization.yaml
+++ b/external-secrets/kustomization.yaml
@@ -1,5 +1,3 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-
-resources:
-  - namespace.yaml
+resources: []
diff --git a/external-secrets/namespace.yaml b/external-secrets/namespace.yaml
deleted file mode 100644
index 8f68275..0000000
--- a/external-secrets/namespace.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: external-secrets
-  labels:
-    goldilocks.fairwinds.com/enabled: "true"
diff --git a/falco/argocd.yaml b/falco/argocd.yaml
index 8149654..146f6ad 100644
--- a/falco/argocd.yaml
+++ b/falco/argocd.yaml
@@ -4,12 +4,10 @@ metadata:
   name: falco
   namespace: argocd
   finalizers:
-    - resources-finalizer.argocd.argoproj.io
+  - resources-finalizer.argocd.argoproj.io
 spec:
   project: default
-
   source:
-    # Helm chart from Falcosecurity repository
     repoURL: https://falcosecurity.github.io/charts
     chart: falco
     targetRevision: 4.20.0
@@ -81,41 +79,37 @@ spec:
             key: node-role.kubernetes.io/master
           - effect: NoSchedule
             key: node-role.kubernetes.io/control-plane
-
   destination:
     server: https://kubernetes.default.svc
     namespace: falco
-
   syncPolicy:
     automated:
       prune: true
       selfHeal: true
       allowEmpty: false
-
     syncOptions:
-      - CreateNamespace=true
-      - PrunePropagationPolicy=foreground
-      - PruneLast=true
-      - ServerSideApply=true
-      - RespectIgnoreDifferences=true
-      - ApplyOutOfSyncOnly=true
-
+    - CreateNamespace=true
+    - PrunePropagationPolicy=foreground
+    - PruneLast=true
+    - ServerSideApply=true
+    - RespectIgnoreDifferences=true
+    - ApplyOutOfSyncOnly=true
     retry:
       limit: 5
       backoff:
         duration: 5s
         factor: 2
         maxDuration: 3m
-
-  # Ignore StatefulSet differences managed by Kubernetes
+    managedNamespaceMetadata:
+      labels:
+        goldilocks.fairwinds.com/enabled: 'true'
   ignoreDifferences:
-    - group: apps
-      kind: StatefulSet
-      jqPathExpressions:
-        - '.spec.persistentVolumeClaimRetentionPolicy'
-        - '.spec.volumeClaimTemplates[].metadata.creationTimestamp'
-        - '.spec.volumeClaimTemplates[].status'
-        - '.spec.volumeClaimTemplates[].apiVersion'
-        - '.spec.volumeClaimTemplates[].kind'
-
+  - group: apps
+    kind: StatefulSet
+    jqPathExpressions:
+    - .spec.persistentVolumeClaimRetentionPolicy
+    - .spec.volumeClaimTemplates[].metadata.creationTimestamp
+    - .spec.volumeClaimTemplates[].status
+    - .spec.volumeClaimTemplates[].apiVersion
+    - .spec.volumeClaimTemplates[].kind
   revisionHistoryLimit: 10
diff --git a/falco/kustomization.yaml b/falco/kustomization.yaml
index 7ecdf25..6802ef0 100644
--- a/falco/kustomization.yaml
+++ b/falco/kustomization.yaml
@@ -1,7 +1,5 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-
 resources:
-  - namespace.yaml
-  - vault/falco-ui-secret.yaml
-  - ingress.yaml
+- vault/falco-ui-secret.yaml
+- ingress.yaml
diff --git a/falco/namespace.yaml b/falco/namespace.yaml
deleted file mode 100644
index a13bd9f..0000000
--- a/falco/namespace.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: falco
-  labels:
-    goldilocks.fairwinds.com/enabled: "true"
diff --git a/vault/argocd.yaml b/vault/argocd.yaml
index 762059b..a1b52ae 100644
--- a/vault/argocd.yaml
+++ b/vault/argocd.yaml
@@ -4,44 +4,41 @@ metadata:
   name: vault
   namespace: argocd
   finalizers:
-    - resources-finalizer.argocd.argoproj.io
+  - resources-finalizer.argocd.argoproj.io
 spec:
   project: default
-
   sources:
-    - repoURL: https://helm.releases.hashicorp.com
-      chart: vault
-      targetRevision: 0.28.1
-      helm:
-        valueFiles:
-          - $values/vault/helm-values.yaml
-    - repoURL: https://gitea0213.kro.kr/bluemayne/cluster-infrastructure.git
-      targetRevision: main
-      ref: values
-    - repoURL: https://gitea0213.kro.kr/bluemayne/cluster-infrastructure.git
-      targetRevision: main
-      path: vault
-
+  - repoURL: https://helm.releases.hashicorp.com
+    chart: vault
+    targetRevision: 0.28.1
+    helm:
+      valueFiles:
+      - $values/vault/helm-values.yaml
+  - repoURL: https://gitea0213.kro.kr/bluemayne/cluster-infrastructure.git
+    targetRevision: main
+    ref: values
+  - repoURL: https://gitea0213.kro.kr/bluemayne/cluster-infrastructure.git
+    targetRevision: main
+    path: vault
   destination:
     server: https://kubernetes.default.svc
     namespace: vault
-
   syncPolicy:
     automated:
       prune: true
       selfHeal: true
       allowEmpty: false
-
     syncOptions:
-      - CreateNamespace=false
-      - PrunePropagationPolicy=foreground
-      - PruneLast=true
-
+    - CreateNamespace=true
+    - PrunePropagationPolicy=foreground
+    - PruneLast=true
     retry:
       limit: 5
       backoff:
         duration: 5s
         factor: 2
         maxDuration: 3m
-
+    managedNamespaceMetadata:
+      labels:
+        goldilocks.fairwinds.com/enabled: 'true'
   revisionHistoryLimit: 10
diff --git a/vault/kustomization.yaml b/vault/kustomization.yaml
index 08e3cbb..cdec870 100644
--- a/vault/kustomization.yaml
+++ b/vault/kustomization.yaml
@@ -1,6 +1,4 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-
 resources:
-  - namespace.yaml
-  - cluster-secret-store.yaml
\ No newline at end of file
+- cluster-secret-store.yaml
diff --git a/vault/namespace.yaml b/vault/namespace.yaml
deleted file mode 100644
index 64ec313..0000000
--- a/vault/namespace.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: vault
-  labels:
-    goldilocks.fairwinds.com/enabled: "true"