diff --git a/pgweb/argocd/pgweb.yaml b/pgweb/argocd.yaml
similarity index 100%
rename from pgweb/argocd/pgweb.yaml
rename to pgweb/argocd.yaml
diff --git a/pgweb/kustomization.yaml b/pgweb/kustomization.yaml
index 02cd04c..1ab516c 100644
--- a/pgweb/kustomization.yaml
+++ b/pgweb/kustomization.yaml
@@ -2,8 +2,9 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
-  # ArgoCD Application 리소스는 infrastructure/kustomization.yaml에서 관리
-  # - argocd/pgweb.yaml
+  # argocd.yaml은 수동으로 관리 (순환 참조 방지)
+  # - argocd.yaml
+  - namespace.yaml
   - deployment.yaml
   - vault/serviceaccount.yaml
   - vault/secretstore.yaml
diff --git a/pgweb/namespace.yaml b/pgweb/namespace.yaml
new file mode 100644
index 0000000..7a16c6a
--- /dev/null
+++ b/pgweb/namespace.yaml
@@ -0,0 +1,6 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: pgweb
+  labels:
+    goldilocks.fairwinds.com/enabled: "true"
diff --git a/postgresql-dev/argocd/postgresql-dev.yaml b/postgresql-dev/argocd.yaml
similarity index 93%
rename from postgresql-dev/argocd/postgresql-dev.yaml
rename to postgresql-dev/argocd.yaml
index 9e7844c..0a1d6db 100644
--- a/postgresql-dev/argocd/postgresql-dev.yaml
+++ b/postgresql-dev/argocd.yaml
@@ -14,7 +14,7 @@ spec:
       targetRevision: 16.2.1
       helm:
         valueFiles:
-          - $values/postgresql-dev/helm-values/postgresql-dev.yaml
+          - $values/postgresql-dev/helm-values.yaml
     - repoURL: https://gitea0213.kro.kr/bluemayne/databases.git
       targetRevision: main
       ref: values
diff --git a/postgresql-dev/helm-values/postgresql-dev.yaml b/postgresql-dev/helm-values.yaml
similarity index 100%
rename from postgresql-dev/helm-values/postgresql-dev.yaml
rename to postgresql-dev/helm-values.yaml
diff --git a/postgresql-dev/kustomization.yaml b/postgresql-dev/kustomization.yaml
index 6152871..7a3efce 100644
--- a/postgresql-dev/kustomization.yaml
+++ b/postgresql-dev/kustomization.yaml
@@ -2,6 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
-  # ArgoCD Application 리소스는 infrastructure/kustomization.yaml에서 관리
-  # - argocd/postgresql-dev.yaml
+  # argocd.yaml은 수동으로 관리 (순환 참조 방지)
+  # - argocd.yaml
+  - namespace.yaml
   - vault/postgresql-password-dev.yaml
diff --git a/postgresql-dev/namespace.yaml b/postgresql-dev/namespace.yaml
new file mode 100644
index 0000000..2b34c50
--- /dev/null
+++ b/postgresql-dev/namespace.yaml
@@ -0,0 +1,6 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: postgresql-dev
+  labels:
+    goldilocks.fairwinds.com/enabled: "true"