diff --git a/charts/spire/Chart.yaml b/charts/spire/Chart.yaml
index b062568..e6c6696 100644
--- a/charts/spire/Chart.yaml
+++ b/charts/spire/Chart.yaml
@@ -1,31 +1,7 @@
 apiVersion: v2
 name: spire
-description: |
-  A Helm chart for deploying spire-server and spire-agent.
-
-  > **Warning**: Please note this chart requires Projected Service Account Tokens which has to be enabled on your k8s api server.
-
-  > **Note**: Minimum Spire version is `v1.5.3`.
-
-  To enable Projected Service Account Tokens on Docker for Mac/Windows run the following
-  command to SSH into the Docker Desktop K8s VM.
-
-  ```bash
-  docker run -it --privileged --pid=host debian nsenter -t 1 -m -u -n -i sh
-  ```
-
-  Then add the following to `/etc/kubernetes/manifests/kube-apiserver.yaml`
-
-  ```yaml
-  spec:
-    containers:
-      - command:
-          - kube-apiserver
-          - --api-audiences=api,spire-server
-          - --service-account-issuer=api,spire-agent
-          - --service-account-key-file=/run/config/pki/sa.pub
-          - --service-account-signing-key-file=/run/config/pki/sa.key
-  ```
+description: >
+  A Helm chart for deploying the complete Spire stack including: spire-server, spire-agent, spiffe-csi-driver, spiffe-oidc-discovery-provider and spire-controller-manager.
 type: application
 version: 0.1.0
 appVersion: "1.5.4"
diff --git a/charts/spire/README.md b/charts/spire/README.md
index 5df6990..e831202 100644
--- a/charts/spire/README.md
+++ b/charts/spire/README.md
@@ -1,8 +1,12 @@
 # spire
 
+<!-- This README.md is generated. Please edit README.md.gotmpl -->
+
 ![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.5.4](https://img.shields.io/badge/AppVersion-1.5.4-informational?style=flat-square)
 
-A Helm chart for deploying spire-server and spire-agent.
+A Helm chart for deploying the complete Spire stack including: spire-server, spire-agent, spiffe-csi-driver, spiffe-oidc-discovery-provider and spire-controller-manager.
+
+**Homepage:** <https://github.com/philips-labs/helm-charts/tree/main/charts/spire>
 
 > **Warning**: Please note this chart requires Projected Service Account Tokens which has to be enabled on your k8s api server.
 
@@ -28,8 +32,6 @@ spec:
         - --service-account-signing-key-file=/run/config/pki/sa.key
 ```
 
-**Homepage:** <https://github.com/philips-labs/helm-charts/tree/main/charts/spire>
-
 ## Maintainers
 
 | Name | Email | Url |
@@ -71,4 +73,3 @@ Kubernetes: `>=1.21.0-0`
 | spire-server.trustDomain | string | `"example.org"` |  |
 
 ----------------------------------------------
-Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0)
diff --git a/charts/spire/README.md.gotmpl b/charts/spire/README.md.gotmpl
new file mode 100644
index 0000000..677a8f4
--- /dev/null
+++ b/charts/spire/README.md.gotmpl
@@ -0,0 +1,45 @@
+{{ template "chart.header" . }}
+
+<!-- This README.md is generated. Please edit README.md.gotmpl -->
+
+{{ template "chart.deprecationWarning" . }}
+
+{{ template "chart.badgesSection" . }}
+
+{{ template "chart.description" . }}
+
+{{ template "chart.homepageLine" . }}
+
+> **Warning**: Please note this chart requires Projected Service Account Tokens which has to be enabled on your k8s api server.
+
+> **Note**: Minimum Spire version is `v1.5.3`.
+
+To enable Projected Service Account Tokens on Docker for Mac/Windows run the following
+command to SSH into the Docker Desktop K8s VM.
+
+```bash
+docker run -it --privileged --pid=host debian nsenter -t 1 -m -u -n -i sh
+```
+
+Then add the following to `/etc/kubernetes/manifests/kube-apiserver.yaml`
+
+```yaml
+spec:
+  containers:
+    - command:
+        - kube-apiserver
+        - --api-audiences=api,spire-server
+        - --service-account-issuer=api,spire-agent
+        - --service-account-key-file=/run/config/pki/sa.pub
+        - --service-account-signing-key-file=/run/config/pki/sa.key
+```
+
+{{ template "chart.maintainersSection" . }}
+
+{{ template "chart.sourcesSection" . }}
+
+{{ template "chart.requirementsSection" . }}
+
+{{ template "chart.valuesSection" . }}
+
+----------------------------------------------
diff --git a/charts/spire/charts/spiffe-csi-driver/README.md b/charts/spire/charts/spiffe-csi-driver/README.md
index 9038f62..4b4579e 100644
--- a/charts/spire/charts/spiffe-csi-driver/README.md
+++ b/charts/spire/charts/spiffe-csi-driver/README.md
@@ -1,5 +1,7 @@
 # spiffe-csi-driver
 
+<!-- This README.md is generated. Please edit README.md.gotmpl -->
+
 ![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.2.1](https://img.shields.io/badge/AppVersion-0.2.1-informational?style=flat-square)
 
 A Helm chart to install the SPIFFE CSI driver.
@@ -33,4 +35,3 @@ A Helm chart to install the SPIFFE CSI driver.
 | serviceAccount.name | string | `""` |  |
 
 ----------------------------------------------
-Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0)
diff --git a/charts/spire/charts/spiffe-csi-driver/README.md.gotmpl b/charts/spire/charts/spiffe-csi-driver/README.md.gotmpl
new file mode 100644
index 0000000..13545c4
--- /dev/null
+++ b/charts/spire/charts/spiffe-csi-driver/README.md.gotmpl
@@ -0,0 +1,21 @@
+{{ template "chart.header" . }}
+
+<!-- This README.md is generated. Please edit README.md.gotmpl -->
+
+{{ template "chart.deprecationWarning" . }}
+
+{{ template "chart.badgesSection" . }}
+
+{{ template "chart.description" . }}
+
+{{ template "chart.homepageLine" . }}
+
+{{ template "chart.maintainersSection" . }}
+
+{{ template "chart.sourcesSection" . }}
+
+{{ template "chart.requirementsSection" . }}
+
+{{ template "chart.valuesSection" . }}
+
+----------------------------------------------
diff --git a/charts/spire/charts/spiffe-oidc-discovery-provider/README.md b/charts/spire/charts/spiffe-oidc-discovery-provider/README.md
index 9c59615..eaaf064 100644
--- a/charts/spire/charts/spiffe-oidc-discovery-provider/README.md
+++ b/charts/spire/charts/spiffe-oidc-discovery-provider/README.md
@@ -1,5 +1,7 @@
 # spiffe-oidc-discovery-provider
 
+<!-- This README.md is generated. Please edit README.md.gotmpl -->
+
 ![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.5.4](https://img.shields.io/badge/AppVersion-1.5.4-informational?style=flat-square)
 
 A Helm chart to install the SPIFFE OIDC discovery provider.
@@ -51,4 +53,3 @@ A Helm chart to install the SPIFFE OIDC discovery provider.
 | trustDomain | string | `"example.org"` |  |
 
 ----------------------------------------------
-Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0)
diff --git a/charts/spire/charts/spiffe-oidc-discovery-provider/README.md.gotmpl b/charts/spire/charts/spiffe-oidc-discovery-provider/README.md.gotmpl
new file mode 100644
index 0000000..13545c4
--- /dev/null
+++ b/charts/spire/charts/spiffe-oidc-discovery-provider/README.md.gotmpl
@@ -0,0 +1,21 @@
+{{ template "chart.header" . }}
+
+<!-- This README.md is generated. Please edit README.md.gotmpl -->
+
+{{ template "chart.deprecationWarning" . }}
+
+{{ template "chart.badgesSection" . }}
+
+{{ template "chart.description" . }}
+
+{{ template "chart.homepageLine" . }}
+
+{{ template "chart.maintainersSection" . }}
+
+{{ template "chart.sourcesSection" . }}
+
+{{ template "chart.requirementsSection" . }}
+
+{{ template "chart.valuesSection" . }}
+
+----------------------------------------------
diff --git a/charts/spire/charts/spire-agent/README.md b/charts/spire/charts/spire-agent/README.md
index 90e77f9..dd4af6d 100644
--- a/charts/spire/charts/spire-agent/README.md
+++ b/charts/spire/charts/spire-agent/README.md
@@ -1,5 +1,7 @@
 # spire-agent
 
+<!-- This README.md is generated. Please edit README.md.gotmpl -->
+
 ![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.5.4](https://img.shields.io/badge/AppVersion-1.5.4-informational?style=flat-square)
 
 A Helm chart to install the SPIRE agent.
@@ -36,4 +38,3 @@ A Helm chart to install the SPIRE agent.
 | waitForIt.resources | object | `{}` |  |
 
 ----------------------------------------------
-Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0)
diff --git a/charts/spire/charts/spire-agent/README.md.gotmpl b/charts/spire/charts/spire-agent/README.md.gotmpl
new file mode 100644
index 0000000..13545c4
--- /dev/null
+++ b/charts/spire/charts/spire-agent/README.md.gotmpl
@@ -0,0 +1,21 @@
+{{ template "chart.header" . }}
+
+<!-- This README.md is generated. Please edit README.md.gotmpl -->
+
+{{ template "chart.deprecationWarning" . }}
+
+{{ template "chart.badgesSection" . }}
+
+{{ template "chart.description" . }}
+
+{{ template "chart.homepageLine" . }}
+
+{{ template "chart.maintainersSection" . }}
+
+{{ template "chart.sourcesSection" . }}
+
+{{ template "chart.requirementsSection" . }}
+
+{{ template "chart.valuesSection" . }}
+
+----------------------------------------------
diff --git a/charts/spire/charts/spire-server/README.md b/charts/spire/charts/spire-server/README.md
index 3afd7b3..d0571d6 100644
--- a/charts/spire/charts/spire-server/README.md
+++ b/charts/spire/charts/spire-server/README.md
@@ -1,5 +1,7 @@
 # spire-server
 
+<!-- This README.md is generated. Please edit README.md.gotmpl -->
+
 ![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.5.4](https://img.shields.io/badge/AppVersion-1.5.4-informational?style=flat-square)
 
 A Helm chart to install the SPIRE server.
@@ -71,4 +73,3 @@ A Helm chart to install the SPIRE server.
 | upstreamAuthority.disk.secret.name | string | `"spiffe-upstream-ca"` | If secret creation is disabled, the secret with this name will be used. |
 
 ----------------------------------------------
-Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0)
diff --git a/charts/spire/charts/spire-server/README.md.gotmpl b/charts/spire/charts/spire-server/README.md.gotmpl
new file mode 100644
index 0000000..13545c4
--- /dev/null
+++ b/charts/spire/charts/spire-server/README.md.gotmpl
@@ -0,0 +1,21 @@
+{{ template "chart.header" . }}
+
+<!-- This README.md is generated. Please edit README.md.gotmpl -->
+
+{{ template "chart.deprecationWarning" . }}
+
+{{ template "chart.badgesSection" . }}
+
+{{ template "chart.description" . }}
+
+{{ template "chart.homepageLine" . }}
+
+{{ template "chart.maintainersSection" . }}
+
+{{ template "chart.sourcesSection" . }}
+
+{{ template "chart.requirementsSection" . }}
+
+{{ template "chart.valuesSection" . }}
+
+----------------------------------------------