diff --git a/cert-manager/argocd-issuers.yaml b/cert-manager/argocd-issuers.yaml
deleted file mode 100644
index 523d25e..0000000
--- a/cert-manager/argocd-issuers.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: cert-manager-issuers
-  namespace: argocd
-  finalizers:
-    - resources-finalizer.argocd.argoproj.io
-spec:
-  project: default
-
-  source:
-    repoURL: https://gitea0213.kro.kr/bluemayne/cluster-infrastructure.git
-    targetRevision: main
-    path: cert-manager
-
-  destination:
-    server: https://kubernetes.default.svc
-    namespace: cert-manager
-
-  syncPolicy:
-    automated:
-      prune: true
-      selfHeal: true
-      allowEmpty: false
-
-    syncOptions:
-      - CreateNamespace=false
-      - PrunePropagationPolicy=foreground
-
-    retry:
-      limit: 5
-      backoff:
-        duration: 5s
-        factor: 2
-        maxDuration: 3m
-
-  revisionHistoryLimit: 10
-
diff --git a/cert-manager/argocd-certmanager.yaml b/cert-manager/argocd.yaml
similarity index 88%
rename from cert-manager/argocd-certmanager.yaml
rename to cert-manager/argocd.yaml
index fffef9b..0d1d1aa 100644
--- a/cert-manager/argocd-certmanager.yaml
+++ b/cert-manager/argocd.yaml
@@ -9,17 +9,18 @@ spec:
   project: default
 
   sources:
-    # Helm chart from Jetstack repository
     - repoURL: https://charts.jetstack.io
       chart: cert-manager
       targetRevision: v1.16.2
       helm:
         valueFiles:
           - $values/cert-manager/helm-values.yaml
-    # Values file from Git repository
     - 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: cert-manager
 
   destination:
     server: https://kubernetes.default.svc
diff --git a/cert-manager/cluster-issuer-staging.yaml b/cert-manager/cluster-issuer-staging.yaml
deleted file mode 100644
index 51e8452..0000000
--- a/cert-manager/cluster-issuer-staging.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-apiVersion: cert-manager.io/v1
-kind: ClusterIssuer
-metadata:
-  name: letsencrypt-staging
-spec:
-  acme:
-    # Let's Encrypt Staging 서버 (테스트용)
-    # Rate limit이 없어서 테스트할 때 사용
-    server: https://acme-staging-v02.api.letsencrypt.org/directory
-
-    # 인증서 만료 알림을 받을 이메일 주소
-    email: bluemayne0213@icloud.com
-
-    # ACME 계정의 private key를 저장할 Secret 이름
-    privateKeySecretRef:
-      name: letsencrypt-staging
-
-    # HTTP-01 challenge를 사용하여 도메인 소유권 검증
-    solvers:
-    - http01:
-        ingress:
-          class: haproxy
diff --git a/cert-manager/cluster-issuer-prod.yaml b/cert-manager/cluster-issuer.yaml
similarity index 100%
rename from cert-manager/cluster-issuer-prod.yaml
rename to cert-manager/cluster-issuer.yaml
diff --git a/cert-manager/kustomization.yaml b/cert-manager/kustomization.yaml
index 4bf1b87..0223a6b 100644
--- a/cert-manager/kustomization.yaml
+++ b/cert-manager/kustomization.yaml
@@ -2,9 +2,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
-  # argocd.yaml files은 수동으로 관리 (순환 참조 방지)
-  # - argocd-certmanager.yaml
-  # - argocd-issuers.yaml
   - namespace.yaml
-  - cluster-issuer-prod.yaml
-  - cluster-issuer-staging.yaml
+  - cluster-issuer.yaml