diff --git a/code-server/argocd/code-server.yaml b/code-server/argocd.yaml
similarity index 88%
rename from code-server/argocd/code-server.yaml
rename to code-server/argocd.yaml
index 87cf984..cbfb674 100644
--- a/code-server/argocd/code-server.yaml
+++ b/code-server/argocd.yaml
@@ -14,7 +14,7 @@ spec:
       path: ci/helm-chart
       helm:
         valueFiles:
-          - $values/code-server/helm-values/code-server.yaml
+          - $values/code-server/helm-values.yaml
     - repoURL: https://gitea0213.kro.kr/bluemayne/applications.git
       targetRevision: main
       ref: values
@@ -30,8 +30,7 @@ spec:
     automated:
       prune: true
       selfHeal: true
-    syncOptions:
-      - CreateNamespace=true
+
     retry:
       limit: 5
       backoff:
diff --git a/code-server/helm-values/code-server.yaml b/code-server/helm-values.yaml
similarity index 100%
rename from code-server/helm-values/code-server.yaml
rename to code-server/helm-values.yaml
diff --git a/docusaurus/argocd/docusaurus.yaml b/docusaurus/argocd.yaml
similarity index 97%
rename from docusaurus/argocd/docusaurus.yaml
rename to docusaurus/argocd.yaml
index 646d1e2..3099fef 100644
--- a/docusaurus/argocd/docusaurus.yaml
+++ b/docusaurus/argocd.yaml
@@ -24,7 +24,6 @@ spec:
       allowEmpty: false
 
     syncOptions:
-      - CreateNamespace=true
       - PrunePropagationPolicy=foreground
       - PruneLast=true
 
diff --git a/gitea/argocd/gitea.yaml b/gitea/argocd.yaml
similarity index 93%
rename from gitea/argocd/gitea.yaml
rename to gitea/argocd.yaml
index 36bb20d..57b1304 100644
--- a/gitea/argocd/gitea.yaml
+++ b/gitea/argocd.yaml
@@ -15,7 +15,7 @@ spec:
       targetRevision: 12.4.0
       helm:
         valueFiles:
-          - $values/gitea/helm-values/gitea.yaml
+          - $values/gitea/helm-values.yaml
     # Values file from applications repository
     - repoURL: https://gitea0213.kro.kr/bluemayne/applications.git
       targetRevision: main
@@ -36,7 +36,6 @@ spec:
       allowEmpty: false
 
     syncOptions:
-      - CreateNamespace=true
       - PrunePropagationPolicy=foreground
       - PruneLast=true
 
diff --git a/gitea/helm-values/gitea.yaml b/gitea/helm-values.yaml
similarity index 100%
rename from gitea/helm-values/gitea.yaml
rename to gitea/helm-values.yaml
diff --git a/gitea/kustomization.yaml b/gitea/kustomization.yaml
index 54b8519..6c9abdb 100644
--- a/gitea/kustomization.yaml
+++ b/gitea/kustomization.yaml
@@ -2,10 +2,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
-  # ArgoCD Application (주석 처리: circular dependency 방지)
-  # - argocd/gitea.yaml
-  # Gitea Application은 수동으로 적용: kubectl apply -f gitea/argocd/gitea.yaml
-
   # Namespace with Goldilocks label
   - namespace.yaml
 
diff --git a/homer/argocd/homer.yaml b/homer/argocd.yaml
similarity index 92%
rename from homer/argocd/homer.yaml
rename to homer/argocd.yaml
index c3f8bae..98e21fd 100644
--- a/homer/argocd/homer.yaml
+++ b/homer/argocd.yaml
@@ -21,8 +21,7 @@ spec:
     automated:
       prune: true
       selfHeal: true
-    syncOptions:
-      - CreateNamespace=true
+
     retry:
       limit: 5
       backoff:
diff --git a/umami/argocd/umami.yaml b/umami/argocd.yaml
similarity index 92%
rename from umami/argocd/umami.yaml
rename to umami/argocd.yaml
index 8d3b0b4..ba8cd05 100644
--- a/umami/argocd/umami.yaml
+++ b/umami/argocd.yaml
@@ -14,7 +14,7 @@ spec:
       targetRevision: 6.0.1
       helm:
         valueFiles:
-          - $values/umami/helm-values/umami.yaml
+          - $values/umami/helm-values.yaml
     - repoURL: https://gitea0213.kro.kr/bluemayne/applications.git
       targetRevision: main
       ref: values
@@ -40,8 +40,7 @@ spec:
     automated:
       prune: true
       selfHeal: true
-    syncOptions:
-      - CreateNamespace=true
+
     retry:
       limit: 5
       backoff:
diff --git a/umami/helm-values/umami.yaml b/umami/helm-values.yaml
similarity index 100%
rename from umami/helm-values/umami.yaml
rename to umami/helm-values.yaml