diff --git a/charts/kubezero-argo-cd/README.md b/charts/kubezero-argo-cd/README.md
index de55733d..8a94d647 100644
--- a/charts/kubezero-argo-cd/README.md
+++ b/charts/kubezero-argo-cd/README.md
@@ -2,7 +2,7 @@ kubezero-argo-cd
 ================
 KubeZero ArgoCD Helm chart to install ArgoCD itself and the KubeZero ArgoCD Application
 
-Current chart version is `0.3.5`
+Current chart version is `0.3.6`
 
 Source code can be found [here](https://kubezero.com)
 
diff --git a/charts/kubezero-metrics/README.md b/charts/kubezero-metrics/README.md
index e341dfd6..55028c90 100644
--- a/charts/kubezero-metrics/README.md
+++ b/charts/kubezero-metrics/README.md
@@ -1,8 +1,8 @@
-kubezero-cert-manager
-=====================
-KubeZero Umbrella Chart for cert-manager
+kubezero-metrics
+================
+KubeZero Umbrella Chart for prometheus-operator
 
-Current chart version is `0.3.5`
+Current chart version is `0.0.1`
 
 Source code can be found [here](https://kubezero.com)
 
@@ -10,38 +10,31 @@ Source code can be found [here](https://kubezero.com)
 
 | Repository | Name | Version |
 |------------|------|---------|
-| https://charts.jetstack.io | cert-manager | 0.15.1 |
+| https://kubernetes-charts.storage.googleapis.com/ | prometheus-operator | 9.3.0 |
 | https://zero-down-time.github.io/kubezero/ | kubezero-lib | >= 0.1.1 |
 
-## AWS - IAM Role
-If you use kiam or kube2iam and restrict access on nodes running cert-manager please adjust:
-```
-cert-manager.podAnnotations:
-  iam.amazonaws.com/role: <ROLE>
-```
-
-## Resolver Secrets
-If your resolvers need additional sercrets like CloudFlare API tokens etc. make sure to provide these secrets separatly matching your defined issuers.
-
 ## Chart Values
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
-| cert-manager.cainjector.nodeSelector."node-role.kubernetes.io/master" | string | `""` |  |
-| cert-manager.cainjector.tolerations[0].effect | string | `"NoSchedule"` |  |
-| cert-manager.cainjector.tolerations[0].key | string | `"node-role.kubernetes.io/master"` |  |
-| cert-manager.extraArgs[0] | string | `"--dns01-recursive-nameservers-only"` |  |
-| cert-manager.ingressShim.defaultIssuerKind | string | `"ClusterIssuer"` |  |
-| cert-manager.ingressShim.defaultIssuerName | string | `"letsencrypt-dns-prod"` |  |
-| cert-manager.installCRDs | bool | `true` |  |
-| cert-manager.nodeSelector."node-role.kubernetes.io/master" | string | `""` |  |
-| cert-manager.podAnnotations | object | `{}` | "iam.amazonaws.com/roleIAM:" role ARN the cert-manager might use via kiam eg."arn:aws:iam::123456789012:role/certManagerRoleArn" |
-| cert-manager.prometheus.servicemonitor.enabled | bool | `false` |  |
-| cert-manager.tolerations[0].effect | string | `"NoSchedule"` |  |
-| cert-manager.tolerations[0].key | string | `"node-role.kubernetes.io/master"` |  |
-| cert-manager.webhook.nodeSelector."node-role.kubernetes.io/master" | string | `""` |  |
-| cert-manager.webhook.tolerations[0].effect | string | `"NoSchedule"` |  |
-| cert-manager.webhook.tolerations[0].key | string | `"node-role.kubernetes.io/master"` |  |
-| clusterIssuer | object | `{}` |  |
-| localCA.enabled | bool | `true` |  |
-| localCA.selfsigning | bool | `true` |  |
+| prometheus-operator.alertmanager.enabled | bool | `false` |  |
+| prometheus-operator.coreDns.enabled | bool | `false` |  |
+| prometheus-operator.defaultRules.create | bool | `false` |  |
+| prometheus-operator.grafana.enabled | bool | `false` |  |
+| prometheus-operator.kubeApiServer.enabled | bool | `false` |  |
+| prometheus-operator.kubeControllerManager.enabled | bool | `false` |  |
+| prometheus-operator.kubeDns.enabled | bool | `false` |  |
+| prometheus-operator.kubeEtcd.enabled | bool | `false` |  |
+| prometheus-operator.kubeProxy.enabled | bool | `false` |  |
+| prometheus-operator.kubeScheduler.enabled | bool | `false` |  |
+| prometheus-operator.kubeStateMetrics.enabled | bool | `false` |  |
+| prometheus-operator.kubelet.enabled | bool | `false` |  |
+| prometheus-operator.nodeExporter.enabled | bool | `false` |  |
+| prometheus-operator.prometheus.enabled | bool | `false` |  |
+| prometheus-operator.prometheusOperator.admissionWebhooks.enabled | bool | `false` |  |
+| prometheus-operator.prometheusOperator.createCustomResource | bool | `false` |  |
+| prometheus-operator.prometheusOperator.enabled | bool | `true` |  |
+| prometheus-operator.prometheusOperator.namespaces.additional[0] | string | `"kube-system"` |  |
+| prometheus-operator.prometheusOperator.namespaces.releaseNamespace | bool | `true` |  |
+| prometheus-operator.prometheusOperator.serviceMonitor.selfMonitor | bool | `false` |  |
+| prometheus-operator.prometheusOperator.tlsProxy.enabled | bool | `false` |  |