diff --git a/argocd/helm-values.yaml b/argocd/helm-values.yaml
index 78b2bb9..bf528a8 100644
--- a/argocd/helm-values.yaml
+++ b/argocd/helm-values.yaml
@@ -6,9 +6,9 @@
 # GLOBAL SETTINGS
 # =============================================================================
 global:
-  # Deploy to master node
+  # Deploy to control-plane node
   nodeSelector:
-    node-role.kubernetes.io/master: "true"
+    node-role.kubernetes.io/control-plane: "true"
 
   # Tolerate control-plane taint
   tolerations:
@@ -75,15 +75,11 @@ server:
   ingress:
     enabled: true
     ingressClassName: traefik
+    hostname: argocd0213.kro.kr
     annotations:
       cert-manager.io/cluster-issuer: letsencrypt-prod
       traefik.ingress.kubernetes.io/router.middlewares: authelia-authelia-auth@kubernetescrd
-    hosts:
-      - argocd0213.kro.kr
-    tls:
-      - secretName: argocd-server-tls
-        hosts:
-          - argocd0213.kro.kr
+    tls: true
 
   # Resource settings
   resources:
diff --git a/kustomization.yaml b/kustomization.yaml
index 198aab5..363f71a 100644
--- a/kustomization.yaml
+++ b/kustomization.yaml
@@ -10,5 +10,5 @@ resources:
   # ArgoCD Image Updater
   - argocd-image-updater/argocd.yaml
 
-  # ArgoCD configuration (no Application, just configuration)
-  - argocd
+  # ArgoCD self-management Application
+  - argocd/argocd.yaml