diff --git a/seichi-onp-k8s/manifests/seichi-kubernetes/argocd-helm-chart-values.yaml b/seichi-onp-k8s/manifests/seichi-kubernetes/argocd-helm-chart-values.yaml
index f1b72d3b8..0369b15fa 100644
--- a/seichi-onp-k8s/manifests/seichi-kubernetes/argocd-helm-chart-values.yaml
+++ b/seichi-onp-k8s/manifests/seichi-kubernetes/argocd-helm-chart-values.yaml
@@ -27,10 +27,16 @@ server:
     enabled: true
     minAvailable: 1
     maxUnavailable: 0
+  metrics:
+    enabled: true
+    serviceMonitor:
+      enabled: true
+      additionalLabels:
+        release: prometheus
 
-  configEnabled: true
-  # -- [General Argo CD configuration]
-  config:
+configs:
+  cm:
+    create: true
     # Argo CD instance label key
     application.instanceLabelKey: argocd.argoproj.io/instance
     kustomize.buildOptions: --load-restrictor LoadRestrictionsNone
@@ -53,9 +59,9 @@ server:
           redirectURIs:
             - https://argo-workflows.onp-k8s.admin.seichi.click/oauth2/callback
           secretEnv: ARGO_WORKFLOWS_SSO_CLIENT_SECRET
-    admin.enabled: "false"
-
-  rbacConfig:
+    admin.enabled: false
+  rbac:
+    create: true
     # policy.csv is an file containing user-defined RBAC policies and role definitions (optional).
     # Policy rules are in the form:
     #   p, subject, resource, action, object, effect
@@ -69,13 +75,6 @@ server:
     # but will see no apps, projects, etc...
     policy.default: role:readonly
 
-  metrics:
-    enabled: true
-    serviceMonitor:
-      enabled: true
-      additionalLabels:
-        release: prometheus
-
 controller:
   resources:
     limits:
diff --git a/terraform/onp_cluster_argocd.tf b/terraform/onp_cluster_argocd.tf
index f2c2b0ff4..e27e1abf1 100644
--- a/terraform/onp_cluster_argocd.tf
+++ b/terraform/onp_cluster_argocd.tf
@@ -4,7 +4,7 @@ resource "helm_release" "onp_cluster_argocd" {
   chart      = "argo-cd"
   name       = "argocd"
   namespace  = "argocd"
-  version    = "5.55.0"
+  version    = "6.0.5"
 
   reset_values    = true
   recreate_pods   = true