diff --git a/argocd/ingress/argocd-server-ingress.yaml b/argocd/ingress.yaml
similarity index 100%
rename from argocd/ingress/argocd-server-ingress.yaml
rename to argocd/ingress.yaml
diff --git a/argocd/kustomization.yaml b/argocd/kustomization.yaml
index d7e68be..50de2bf 100644
--- a/argocd/kustomization.yaml
+++ b/argocd/kustomization.yaml
@@ -2,5 +2,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
+  - namespace.yaml
   - argocd-cmd-params-cm.yaml
-  - ingress/argocd-server-ingress.yaml
+  - ingress.yaml
diff --git a/argocd/namespace.yaml b/argocd/namespace.yaml
new file mode 100644
index 0000000..271d708
--- /dev/null
+++ b/argocd/namespace.yaml
@@ -0,0 +1,6 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: argocd
+  labels:
+    goldilocks.fairwinds.com/enabled: "true"
diff --git a/cert-manager/argocd/cert-manager.yaml b/cert-manager/argocd-certmanager.yaml
similarity index 100%
rename from cert-manager/argocd/cert-manager.yaml
rename to cert-manager/argocd-certmanager.yaml
diff --git a/cert-manager/argocd/cert-manager-issuers.yaml b/cert-manager/argocd-issuers.yaml
similarity index 100%
rename from cert-manager/argocd/cert-manager-issuers.yaml
rename to cert-manager/argocd-issuers.yaml
diff --git a/cert-manager/helm-values/cert-manager.yaml b/cert-manager/helm-values.yaml
similarity index 100%
rename from cert-manager/helm-values/cert-manager.yaml
rename to cert-manager/helm-values.yaml
diff --git a/cert-manager/kustomization.yaml b/cert-manager/kustomization.yaml
index c492df9..4bf1b87 100644
--- a/cert-manager/kustomization.yaml
+++ b/cert-manager/kustomization.yaml
@@ -2,8 +2,9 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
-  # ArgoCD Application 리소스는 infrastructure/kustomization.yaml에서 관리
-  # - argocd/cert-manager.yaml
-  # - argocd/cert-manager-issuers.yaml
+  # argocd.yaml files은 수동으로 관리 (순환 참조 방지)
+  # - argocd-certmanager.yaml
+  # - argocd-issuers.yaml
+  - namespace.yaml
   - cluster-issuer-prod.yaml
   - cluster-issuer-staging.yaml
diff --git a/cert-manager/namespace.yaml b/cert-manager/namespace.yaml
new file mode 100644
index 0000000..55bbf01
--- /dev/null
+++ b/cert-manager/namespace.yaml
@@ -0,0 +1,6 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: cert-manager
+  labels:
+    goldilocks.fairwinds.com/enabled: "true"