diff --git a/charts/kubezero-app/Chart.yaml b/charts/kubezero-app/Chart.yaml
index f14be381..adab8799 100644
--- a/charts/kubezero-app/Chart.yaml
+++ b/charts/kubezero-app/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: kubezero-app
 description: KubeZero ArgoCD Application - Root chart of the KubeZero
 type: application
-version: 0.2.1
+version: 0.2.2
 home: https://kubezero.com
 icon: https://cdn.zero-downtime.net/assets/logo_small.png
 keywords:
diff --git a/charts/kubezero-app/templates/aws-ebs-csi-driver.yaml b/charts/kubezero-app/templates/aws-ebs-csi-driver.yaml
new file mode 100644
index 00000000..cf4e108a
--- /dev/null
+++ b/charts/kubezero-app/templates/aws-ebs-csi-driver.yaml
@@ -0,0 +1,3 @@
+{{- if index .Values "aws-ebs-csi-driver" "enabled" }}
+{{ template "kubezero-app.app" dict "root" . "name" "aws-ebs-csi-driver" "type" "helm" }}
+{{- end }}
diff --git a/charts/kubezero-app/values-all.yaml b/charts/kubezero-app/values-all.yaml
index acfbcfb5..d9394345 100644
--- a/charts/kubezero-app/values-all.yaml
+++ b/charts/kubezero-app/values-all.yaml
@@ -24,3 +24,6 @@ cert-manager:
 
 kiam:
   enabled: true
+
+aws-ebs-csi-driver:
+  enabled: true
diff --git a/charts/kubezero-app/values.yaml b/charts/kubezero-app/values.yaml
index 0b88a445..c888333a 100644
--- a/charts/kubezero-app/values.yaml
+++ b/charts/kubezero-app/values.yaml
@@ -24,3 +24,6 @@ cert-manager:
 
 kiam:
   enabled: false
+
+aws-ebs-csi-driver:
+  enabled: false
diff --git a/charts/kubezero-aws-ebs/.helmignore b/charts/kubezero-aws-ebs-csi-driver/.helmignore
similarity index 100%
rename from charts/kubezero-aws-ebs/.helmignore
rename to charts/kubezero-aws-ebs-csi-driver/.helmignore
diff --git a/charts/kubezero-aws-ebs/Chart.yaml b/charts/kubezero-aws-ebs-csi-driver/Chart.yaml
similarity index 93%
rename from charts/kubezero-aws-ebs/Chart.yaml
rename to charts/kubezero-aws-ebs-csi-driver/Chart.yaml
index 2349320c..111306d1 100644
--- a/charts/kubezero-aws-ebs/Chart.yaml
+++ b/charts/kubezero-aws-ebs-csi-driver/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-name: kubezero-aws-ebs
+name: kubezero-aws-ebs-csi-driver
 description: KubeZero Umbrella Chart for aws-ebs-csi-driver
 type: application
 version: 0.1.0
diff --git a/charts/kubezero-aws-ebs/README.md b/charts/kubezero-aws-ebs-csi-driver/README.md
similarity index 100%
rename from charts/kubezero-aws-ebs/README.md
rename to charts/kubezero-aws-ebs-csi-driver/README.md
diff --git a/charts/kubezero-aws-ebs/charts/aws-ebs-csi-driver/.helmignore b/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/.helmignore
similarity index 100%
rename from charts/kubezero-aws-ebs/charts/aws-ebs-csi-driver/.helmignore
rename to charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/.helmignore
diff --git a/charts/kubezero-aws-ebs/charts/aws-ebs-csi-driver/Chart.yaml b/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/Chart.yaml
similarity index 100%
rename from charts/kubezero-aws-ebs/charts/aws-ebs-csi-driver/Chart.yaml
rename to charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/Chart.yaml
diff --git a/charts/kubezero-aws-ebs/charts/aws-ebs-csi-driver/templates/NOTES.txt b/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/NOTES.txt
similarity index 100%
rename from charts/kubezero-aws-ebs/charts/aws-ebs-csi-driver/templates/NOTES.txt
rename to charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/NOTES.txt
diff --git a/charts/kubezero-aws-ebs/charts/aws-ebs-csi-driver/templates/_helpers.tpl b/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/_helpers.tpl
similarity index 100%
rename from charts/kubezero-aws-ebs/charts/aws-ebs-csi-driver/templates/_helpers.tpl
rename to charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/_helpers.tpl
diff --git a/charts/kubezero-aws-ebs/charts/aws-ebs-csi-driver/templates/csidriver.yaml b/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/csidriver.yaml
similarity index 100%
rename from charts/kubezero-aws-ebs/charts/aws-ebs-csi-driver/templates/csidriver.yaml
rename to charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/csidriver.yaml
diff --git a/charts/kubezero-aws-ebs/charts/aws-ebs-csi-driver/templates/daemonset.yaml b/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/daemonset.yaml
similarity index 100%
rename from charts/kubezero-aws-ebs/charts/aws-ebs-csi-driver/templates/daemonset.yaml
rename to charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/daemonset.yaml
diff --git a/charts/kubezero-aws-ebs/charts/aws-ebs-csi-driver/templates/deployment.yaml b/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/deployment.yaml
similarity index 100%
rename from charts/kubezero-aws-ebs/charts/aws-ebs-csi-driver/templates/deployment.yaml
rename to charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/deployment.yaml
diff --git a/charts/kubezero-aws-ebs/charts/aws-ebs-csi-driver/templates/rbac.yaml b/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/rbac.yaml
similarity index 100%
rename from charts/kubezero-aws-ebs/charts/aws-ebs-csi-driver/templates/rbac.yaml
rename to charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/rbac.yaml
diff --git a/charts/kubezero-aws-ebs/charts/aws-ebs-csi-driver/templates/serviceaccount.yaml b/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/serviceaccount.yaml
similarity index 100%
rename from charts/kubezero-aws-ebs/charts/aws-ebs-csi-driver/templates/serviceaccount.yaml
rename to charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/serviceaccount.yaml
diff --git a/charts/kubezero-aws-ebs/charts/aws-ebs-csi-driver/templates/statefulset.yaml b/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/statefulset.yaml
similarity index 100%
rename from charts/kubezero-aws-ebs/charts/aws-ebs-csi-driver/templates/statefulset.yaml
rename to charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/statefulset.yaml
diff --git a/charts/kubezero-aws-ebs/charts/aws-ebs-csi-driver/values.yaml b/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/values.yaml
similarity index 100%
rename from charts/kubezero-aws-ebs/charts/aws-ebs-csi-driver/values.yaml
rename to charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/values.yaml
diff --git a/charts/kubezero-aws-ebs/templates/snapshot-class.yaml b/charts/kubezero-aws-ebs-csi-driver/templates/snapshot-class.yaml
similarity index 100%
rename from charts/kubezero-aws-ebs/templates/snapshot-class.yaml
rename to charts/kubezero-aws-ebs-csi-driver/templates/snapshot-class.yaml
diff --git a/charts/kubezero-aws-ebs/templates/storage-class.yaml b/charts/kubezero-aws-ebs-csi-driver/templates/storage-class.yaml
similarity index 100%
rename from charts/kubezero-aws-ebs/templates/storage-class.yaml
rename to charts/kubezero-aws-ebs-csi-driver/templates/storage-class.yaml
diff --git a/charts/kubezero-aws-ebs/update.sh b/charts/kubezero-aws-ebs-csi-driver/update.sh
similarity index 100%
rename from charts/kubezero-aws-ebs/update.sh
rename to charts/kubezero-aws-ebs-csi-driver/update.sh
diff --git a/charts/kubezero-aws-ebs/values.yaml b/charts/kubezero-aws-ebs-csi-driver/values.yaml
similarity index 100%
rename from charts/kubezero-aws-ebs/values.yaml
rename to charts/kubezero-aws-ebs-csi-driver/values.yaml