diff --git a/charts/kubezero/Chart.yaml b/charts/kubezero/Chart.yaml
index 17386ffd..86734e64 100644
--- a/charts/kubezero/Chart.yaml
+++ b/charts/kubezero/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: kubezero
 description: KubeZero - Root App of Apps chart
 type: application
-version: 1.21.9-1
+version: 1.21.9-4
 home: https://kubezero.com
 icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
 keywords:
diff --git a/charts/kubezero/templates/storage.yaml b/charts/kubezero/templates/storage.yaml
index 6b53fc5c..af957209 100644
--- a/charts/kubezero/templates/storage.yaml
+++ b/charts/kubezero/templates/storage.yaml
@@ -3,6 +3,8 @@
 {{- with index .Values "storage" "lvm-localpv" }}
 lvm-localpv:
   {{- toYaml . | nindent 2 }}
+  prometheus:
+    enabled: {{ $.Values.metrics.enabled }}
 {{- end }}
 
 {{- with .Values.storage.gemini }}
@@ -33,6 +35,12 @@ aws-efs-csi-driver:
       value: "/var/run/secrets/sts.amazonaws.com/serviceaccount/token"
     - name: AWS_STS_REGIONAL_ENDPOINTS
       value: regional
+  # Dynamic Provisioning
+  {{- with index .Values "storage" "aws-efs-csi-driver" "storageClasses" }}
+  storageClasses:
+  {{- toYaml . | nindent 4 }}
+  {{- end }}
+  # Legacy static provisioning
   {{- with index .Values "storage" "aws-efs-csi-driver" "PersistentVolumes" }}
   PersistentVolumes:
   {{- toYaml . | nindent 4 }}
diff --git a/charts/kubezero/values.yaml b/charts/kubezero/values.yaml
index 2f9f104a..b85268c7 100644
--- a/charts/kubezero/values.yaml
+++ b/charts/kubezero/values.yaml
@@ -13,12 +13,12 @@ addons:
 network:
   enabled: false
   retain: true
-  targetRevision: 0.1.0
+  targetRevision: 0.1.7
 
 cert-manager:
   enabled: false
   namespace: cert-manager
-  targetRevision: 0.8.0
+  targetRevision: 0.8.2
 
 # deprecated - removed with 1.22
 kiam:
@@ -27,7 +27,7 @@ kiam:
 
 storage:
   enabled: false
-  targetRevision: 0.5.4
+  targetRevision: 0.5.7
   aws-ebs-csi-driver:
     enabled: false
   aws-efs-csi-driver:
@@ -54,11 +54,11 @@ metrics:
 logging:
   enabled: false
   namespace: logging
-  targetRevision: 0.7.17
+  targetRevision: 0.7.18
 
 argocd:
   enabled: false
   namespace: argocd
-  targetRevision: 0.9.5
+  targetRevision: 0.9.6
   istio:
     enabled: false