diff --git a/charts/kubezero-metrics/values.yaml b/charts/kubezero-metrics/values.yaml
index 89fd951..d6693ac 100644
--- a/charts/kubezero-metrics/values.yaml
+++ b/charts/kubezero-metrics/values.yaml
@@ -118,7 +118,7 @@ kube-prometheus-stack:
       storageSpec:
         volumeClaimTemplate:
           spec:
-            storageClassName: ebs-sc-gp3-xfs
+            # storageClassName: ebs-sc-gp3-xfs
             accessModes: ["ReadWriteOnce"]
             resources:
               requests:
diff --git a/charts/kubezero-storage/templates/lvm-storageclass.yaml b/charts/kubezero-storage/templates/lvm-storageclass.yaml
index af85e7a..fb419ce 100644
--- a/charts/kubezero-storage/templates/lvm-storageclass.yaml
+++ b/charts/kubezero-storage/templates/lvm-storageclass.yaml
@@ -2,6 +2,10 @@ apiVersion: storage.k8s.io/v1
 kind: StorageClass
 metadata:
   name: openebs-lvm
+  {{- if .Values.storageClass.default }}
+  annotations:
+    storageclass.kubernetes.io/is-default-class: "true"
+  {{- end }}
 volumeBindingMode: WaitForFirstConsumer  
 reclaimPolicy: Delete
 parameters:
diff --git a/charts/kubezero-storage/values.yaml b/charts/kubezero-storage/values.yaml
index 0ffcb16..eb5e196 100644
--- a/charts/kubezero-storage/values.yaml
+++ b/charts/kubezero-storage/values.yaml
@@ -41,3 +41,4 @@ openebs:
 
 storageClass:
   vgpattern: ""
+  default: true
diff --git a/charts/kubezero/templates/storage.yaml b/charts/kubezero/templates/storage.yaml
index d973373..c28062f 100644
--- a/charts/kubezero/templates/storage.yaml
+++ b/charts/kubezero/templates/storage.yaml
@@ -1,4 +1,10 @@
 {{- define "storage-values" }}
+
+{{- with index .Values "cert-manager" "storageClass" }}
+storageClass:
+  {{- . | toYaml | nindent 2 }}
+{{- end }}
+
 {{- end }}
 
 {{- define "storage-argo" }}