diff --git a/.helmdocsignore b/.helmdocsignore
new file mode 100644
index 00000000..3a318aec
--- /dev/null
+++ b/.helmdocsignore
@@ -0,0 +1,2 @@
+# Ignore sub-charts
+charts/*/charts/*
diff --git a/charts/kubezero-app/Chart.yaml b/charts/kubezero-app/Chart.yaml
index a69170eb..097128ae 100644
--- a/charts/kubezero-app/Chart.yaml
+++ b/charts/kubezero-app/Chart.yaml
@@ -2,4 +2,11 @@ apiVersion: v2
 name: kubezero-app
 description: KubeZero ArgoCD Application - Root chart of the KubeZero
 type: application
-version: 0.1.2
+version: 0.1.3
+home: https://kubezero.com
+keywords:
+  - kubezero
+  - argocd
+  - gitops
+maintainers:
+  - name: Quarky9
diff --git a/charts/kubezero-app/README.md b/charts/kubezero-app/README.md
new file mode 100644
index 00000000..1bf90ed6
--- /dev/null
+++ b/charts/kubezero-app/README.md
@@ -0,0 +1,21 @@
+kubezero-app
+============
+KubeZero ArgoCD Application - Root chart of the KubeZero
+
+Current chart version is `0.1.3`
+
+Source code can be found [here](https://kubezero.com)
+
+
+
+## Chart Values
+
+| Key | Type | Default | Description |
+|-----|------|---------|-------------|
+| calico.enabled | bool | `false` |  |
+| certManager.enabled | bool | `false` |  |
+| defaultDestination.server | string | `"https://kubernetes.default.svc"` |  |
+| defaultSource.pathPrefix | string | `""` | optional path prefix within repoURL to support eg. remote subtrees |
+| defaultSource.repoURL | string | `"https://github.com/zero-down-time/kubezero"` | default repository for argocd applications |
+| defaultSource.targetRevision | string | `"HEAD"` | default tracking of repoURL |
+| localVolumeProvisioner.enabled | bool | `false` |  |
diff --git a/charts/kubezero-app/templates/calico.yaml b/charts/kubezero-app/templates/calico.yaml
index 492afe98..178943b5 100644
--- a/charts/kubezero-app/templates/calico.yaml
+++ b/charts/kubezero-app/templates/calico.yaml
@@ -4,6 +4,11 @@ kind: Application
 metadata:
   name: calico
   namespace: argocd
+  labels:
+    app.kubernetes.io/name: {{ .Chart.Name }}-calico
+    helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/part-of: kubezero
 spec:
   project: kubezero
 
diff --git a/charts/kubezero-app/templates/cert-manager.yaml b/charts/kubezero-app/templates/cert-manager.yaml
new file mode 100644
index 00000000..98c61a76
--- /dev/null
+++ b/charts/kubezero-app/templates/cert-manager.yaml
@@ -0,0 +1,23 @@
+{{- if .Values.certManager.enabled }}
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: cert-manager
+  namespace: argocd
+  labels:
+    app.kubernetes.io/name: {{ .Chart.Name }}-cert-manager
+    helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/part-of: kubezero
+spec:
+  project: kubezero
+
+  source:
+    repoURL: {{ default .Values.defaultSource.repoURL }}
+    targetRevision: {{ default .Values.defaultSource.targetRevision }}
+    path: {{ default .Values.defaultSource.pathPrefix }}artifacts/cert-manager
+
+  destination:
+    server: {{ default .Values.defaultDestination.server }}
+    namespace: kube-system
+{{- end }}
diff --git a/charts/kubezero-app/templates/local-volume-provisioner.yaml b/charts/kubezero-app/templates/local-volume-provisioner.yaml
index ad81384e..8dce31d2 100644
--- a/charts/kubezero-app/templates/local-volume-provisioner.yaml
+++ b/charts/kubezero-app/templates/local-volume-provisioner.yaml
@@ -4,6 +4,11 @@ kind: Application
 metadata:
   name: local-volume-provisioner
   namespace: argocd
+  labels:
+    app.kubernetes.io/name: {{ .Chart.Name }}-localVolumeProvisioner
+    helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    app.kubernetes.io/part-of: kubezero
   finalizers:
     - resources-finalizer.argocd.argoproj.io
 spec:
diff --git a/charts/kubezero-app/values-all.yaml b/charts/kubezero-app/values-all.yaml
new file mode 100644
index 00000000..ebbbcb94
--- /dev/null
+++ b/charts/kubezero-app/values-all.yaml
@@ -0,0 +1,19 @@
+defaultDestination:
+  server: https://kubernetes.default.svc
+
+defaultSource:
+  # This repoURL is used a base for all the repoURLs applications
+  # Setting this to a eg. private git repo incl. the use of pathPrefix allows kubezero to be 
+  # integrated into any repository as a git subtree if for example public internet access is unavailable
+  repoURL: https://github.com/zero-down-time/kubezero
+  targetRevision: HEAD
+  pathPrefix: ''
+
+calico:
+  enabled: true
+
+localVolumeProvisioner:
+  enabled: true
+
+certManager:
+  enabled: true
diff --git a/charts/kubezero-app/values.yaml b/charts/kubezero-app/values.yaml
index d44d8979..630e427b 100644
--- a/charts/kubezero-app/values.yaml
+++ b/charts/kubezero-app/values.yaml
@@ -1,12 +1,15 @@
 defaultDestination:
   server: https://kubernetes.default.svc
 
+# This repoURL is used a base for all the repoURLs applications
+# Setting this to a eg. private git repo incl. the use of pathPrefix allows kubezero to be 
+# integrated into any repository as a git subtree if for example public internet access is unavailable
 defaultSource:
-  # This repoURL is used a base for all the repoURLs applications
-  # Setting this to a eg. private git repo incl. the use of pathPrefix allows kubezero to be 
-  # integrated into any repository as a git subtree if for example public internet access is unavailable
+  # defaultSource.repoURL -- default repository for argocd applications
   repoURL: https://github.com/zero-down-time/kubezero
+  # defaultSource.targetRevision -- default tracking of repoURL
   targetRevision: HEAD
+  # defaultSource.pathPrefix -- optional path prefix within repoURL to support eg. remote subtrees
   pathPrefix: ''
 
 calico:
@@ -14,3 +17,6 @@ calico:
 
 localVolumeProvisioner:
   enabled: false
+
+certManager:
+  enabled: false
diff --git a/charts/kubezero/README.md b/charts/kubezero/README.md
index 316b91cf..34d805b5 100644
--- a/charts/kubezero/README.md
+++ b/charts/kubezero/README.md
@@ -1 +1,38 @@
-https://blog.1q77.com/2020/03/argocd-istio-ingress/
+kubezero
+========
+KubeZero Helm chart to install Zero Down Time Kuberenetes platform
+
+Current chart version is `0.1.8`
+
+Source code can be found [here](https://kubezero.com)
+
+## Chart Requirements
+
+| Repository | Name | Version |
+|------------|------|---------|
+| https://argoproj.github.io/argo-helm | argo-cd | 2.2.12 |
+
+## Chart Values
+
+| Key | Type | Default | Description |
+|-----|------|---------|-------------|
+| argo-cd.controller.nodeSelector."node-role.kubernetes.io/master" | string | `""` |  |
+| argo-cd.controller.tolerations[0].effect | string | `"NoSchedule"` |  |
+| argo-cd.controller.tolerations[0].key | string | `"node-role.kubernetes.io/master"` |  |
+| argo-cd.dex.enabled | bool | `false` |  |
+| argo-cd.installCRDs | bool | `false` |  |
+| argo-cd.redis.nodeSelector."node-role.kubernetes.io/master" | string | `""` |  |
+| argo-cd.redis.tolerations[0].effect | string | `"NoSchedule"` |  |
+| argo-cd.redis.tolerations[0].key | string | `"node-role.kubernetes.io/master"` |  |
+| argo-cd.repoServer.nodeSelector."node-role.kubernetes.io/master" | string | `""` |  |
+| argo-cd.repoServer.tolerations[0].effect | string | `"NoSchedule"` |  |
+| argo-cd.repoServer.tolerations[0].key | string | `"node-role.kubernetes.io/master"` |  |
+| argo-cd.server.config.url | string | `"argocd.example.com"` |  |
+| argo-cd.server.extraArgs[0] | string | `"--insecure"` |  |
+| argo-cd.server.nodeSelector."node-role.kubernetes.io/master" | string | `""` |  |
+| argo-cd.server.service.servicePortHttpsName | string | `"grpc"` |  |
+| argo-cd.server.tolerations[0].effect | string | `"NoSchedule"` |  |
+| argo-cd.server.tolerations[0].key | string | `"node-role.kubernetes.io/master"` |  |
+| bootstrap | bool | `true` |  |
+| istio.enabled | bool | `false` |  |
+| istio.gateway | string | `"ingressgateway.istio-system.svc.cluster.local"` |  |