diff --git a/charts/kubezero/Chart.yaml b/charts/kubezero/Chart.yaml
index 40dbb79b..eec0cd1f 100644
--- a/charts/kubezero/Chart.yaml
+++ b/charts/kubezero/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: kubezero
 description: KubeZero - Bootstrap and ArgoCD Root App of Apps chart
 type: application
-version: 1.20.8-9
+version: 1.20.8-11
 home: https://kubezero.com
 icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
 keywords:
diff --git a/charts/kubezero/README.md b/charts/kubezero/README.md
index 248d1df5..5734f894 100644
--- a/charts/kubezero/README.md
+++ b/charts/kubezero/README.md
@@ -1,6 +1,6 @@
 # kubezero
 
-![Version: 1.20.8-alpha](https://img.shields.io/badge/Version-1.20.8--alpha-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
+![Version: 1.20.8-11](https://img.shields.io/badge/Version-1.20.8--11-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 
 KubeZero - Bootstrap and ArgoCD Root App of Apps chart
 
@@ -25,41 +25,52 @@ Kubernetes: `>= 1.18.0`
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | HighAvailableControlplane | bool | `false` |  |
+| addons.enabled | bool | `false` |  |
+| addons.targetRevision | string | `"0.1.0"` |  |
 | argocd.crds | bool | `true` |  |
 | argocd.enabled | bool | `false` |  |
 | argocd.istio.enabled | bool | `false` |  |
 | argocd.namespace | string | `"argocd"` |  |
+| argocd.targetRevision | string | `"0.8.2"` |  |
 | aws-ebs-csi-driver.crds | bool | `true` |  |
 | aws-ebs-csi-driver.enabled | bool | `false` |  |
+| aws-ebs-csi-driver.targetRevision | string | `"0.6.4"` |  |
 | aws-efs-csi-driver.enabled | bool | `false` |  |
-| aws-node-termination-handler.enabled | bool | `false` |  |
+| aws-efs-csi-driver.targetRevision | string | `"0.4.2"` |  |
 | calico.crds | bool | `true` |  |
 | calico.enabled | bool | `false` |  |
 | calico.retain | bool | `true` |  |
+| calico.targetRevision | string | `"0.2.2"` |  |
 | cert-manager.crds | bool | `true` |  |
 | cert-manager.enabled | bool | `false` |  |
 | cert-manager.namespace | string | `"cert-manager"` |  |
+| cert-manager.targetRevision | string | `"0.7.0"` |  |
 | istio-ingress.enabled | bool | `false` |  |
 | istio-ingress.namespace | string | `"istio-ingress"` |  |
+| istio-ingress.targetRevision | string | `"0.7.5"` |  |
 | istio.crds | bool | `true` |  |
 | istio.enabled | bool | `false` |  |
 | istio.namespace | string | `"istio-system"` |  |
+| istio.targetRevision | string | `"0.7.5"` |  |
 | kiam.enabled | bool | `false` |  |
+| kiam.targetRevision | string | `"0.3.5"` |  |
+| kubezero.defaultTargetRevision | string | `"*"` |  |
+| kubezero.gitSync | object | `{}` |  |
 | kubezero.repoURL | string | `"https://zero-down-time.github.io/kubezero"` |  |
 | kubezero.server | string | `"https://kubernetes.default.svc"` |  |
-| kubezero.sourceRepos[0] | string | `"https://zero-down-time.github.io/kubezero"` |  |
-| kubezero.targetRevision | string | `"*"` |  |
 | logging.crds | bool | `true` |  |
 | logging.enabled | bool | `false` |  |
 | logging.namespace | string | `"logging"` |  |
+| logging.targetRevision | string | `"0.7.13"` |  |
 | metrics.crds | bool | `true` |  |
 | metrics.enabled | bool | `false` |  |
 | metrics.istio.grafana | object | `{}` |  |
 | metrics.istio.prometheus | object | `{}` |  |
 | metrics.namespace | string | `"monitoring"` |  |
+| metrics.targetRevision | string | `"0.5.2"` |  |
 | storage.crds | bool | `true` |  |
 | storage.enabled | bool | `false` |  |
-| timecapsule.enabled | bool | `false` |  |
+| storage.targetRevision | string | `"0.3.0"` |  |
 
 ----------------------------------------------
 Autogenerated from chart metadata using [helm-docs v1.5.0](https://github.com/norwoodj/helm-docs/releases/v1.5.0)
diff --git a/charts/kubezero/bootstrap.sh b/charts/kubezero/bootstrap.sh
index 1a4b6a01..395558d5 100755
--- a/charts/kubezero/bootstrap.sh
+++ b/charts/kubezero/bootstrap.sh
@@ -13,7 +13,7 @@ helm_version=$(helm version --short)
 echo $helm_version | grep -qe "^v3.[5-9]" || { echo "Helm version >= 3.5 required!"; exit 1; }
 
 # Simulate well-known CRDs being available
-API_VERSIONS="-a monitoring.coreos.com/v1"
+API_VERSIONS="-a monitoring.coreos.com/v1 -a snapshot.storage.k8s.io/v1"
 KUBE_VERSION="--kube-version $(kubectl version -o json | jq -r .serverVersion.gitVersion)"
 
 [ -n "$KUBEZERO_VERSION" ] && KUBEZERO_VERSION="--version $KUBEZERO_VERSION --devel"
diff --git a/charts/kubezero/convert/README.md b/charts/kubezero/convert/README.md
new file mode 100644
index 00000000..beeb3257
--- /dev/null
+++ b/charts/kubezero/convert/README.md
@@ -0,0 +1,26 @@
+# kubezero-git-sync
+
+![Version: 0.1](https://img.shields.io/badge/Version-0.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
+
+KubeZero Git Sync Argo Application to track cluster values via git
+
+**Homepage:** <https://kubezero.com>
+
+## Maintainers
+
+| Name | Email | Url |
+| ---- | ------ | --- |
+| Quarky9 |  |  |
+
+## Requirements
+
+Kubernetes: `>= 1.18.0`
+
+## Values
+
+| Key | Type | Default | Description |
+|-----|------|---------|-------------|
+| kubezero.version | string | `"1.20.8-9"` |  |
+
+----------------------------------------------
+Autogenerated from chart metadata using [helm-docs v1.5.0](https://github.com/norwoodj/helm-docs/releases/v1.5.0)
diff --git a/charts/kubezero/convert/values.yaml b/charts/kubezero/convert/values.yaml
new file mode 100644
index 00000000..8a5025e8
--- /dev/null
+++ b/charts/kubezero/convert/values.yaml
@@ -0,0 +1,2 @@
+kubezero:
+  version: 1.20.8-9
diff --git a/charts/kubezero/templates/cert-manager.yaml b/charts/kubezero/templates/cert-manager.yaml
index 642b8705..85443a36 100644
--- a/charts/kubezero/templates/cert-manager.yaml
+++ b/charts/kubezero/templates/cert-manager.yaml
@@ -25,6 +25,10 @@ cert-manager:
   - name: aws-token
     mountPath: "/var/run/secrets/sts.amazonaws.com/serviceaccount/"
     readOnly: true
+
+  prometheus:
+    servicemonitor:
+      enabled: {{ $.Values.metrics.enabled }}
 {{- end }}
 
 {{- with index .Values "cert-manager" "clusterIssuer" }}
diff --git a/charts/kubezero/templates/metrics.yaml b/charts/kubezero/templates/metrics.yaml
index c8ef51ba..a6a776c1 100644
--- a/charts/kubezero/templates/metrics.yaml
+++ b/charts/kubezero/templates/metrics.yaml
@@ -1,5 +1,9 @@
 {{- define "metrics-values" }}
 
+{{- with .Values.metrics.additionalRuleLabels }}
+additionalRuleLabels:
+{{- toYaml . | nindent 2 }}
+{{- end }}
 {{- with .Values.metrics.istio }}
 istio:
 {{- toYaml . | nindent 2 }}
diff --git a/charts/kubezero/values.yaml b/charts/kubezero/values.yaml
index b5cb2790..56ba25d8 100644
--- a/charts/kubezero/values.yaml
+++ b/charts/kubezero/values.yaml
@@ -20,7 +20,7 @@ cert-manager:
   enabled: false
   crds: true
   namespace: cert-manager
-  targetRevision: 0.6.1
+  targetRevision: 0.7.0
 
 kiam:
   enabled: false
@@ -44,18 +44,18 @@ istio:
   enabled: false
   crds: true
   namespace: istio-system
-  targetRevision: 0.7.4
+  targetRevision: 0.7.5
 
 istio-ingress:
   enabled: false
   namespace: istio-ingress
-  targetRevision: 0.7.4
+  targetRevision: 0.7.5
 
 metrics:
   enabled: false
   crds: true
   namespace: monitoring
-  targetRevision: 0.4.6
+  targetRevision: 0.5.2
   istio:
     grafana: {}
     prometheus: {}
@@ -64,7 +64,7 @@ logging:
   enabled: false
   crds: true
   namespace: logging
-  targetRevision: 0.7.10
+  targetRevision: 0.7.13
 
 argocd:
   enabled: false