diff --git a/helm/ct.yaml b/helm/ct.yaml
index 02d6dbc4d..af706fa3d 100644
--- a/helm/ct.yaml
+++ b/helm/ct.yaml
@@ -1,5 +1,7 @@
+remote: origin
+target-branch: main
 chart-repos:
   - bitnami=https://charts.bitnami.com/bitnami
 chart-dirs:
   - helm
-validate-maintainers: false
+validate-maintainers: false
\ No newline at end of file
diff --git a/helm/dendrite/.helm-docs/about.gotmpl b/helm/dendrite/.helm-docs/about.gotmpl
new file mode 100644
index 000000000..a92c6be42
--- /dev/null
+++ b/helm/dendrite/.helm-docs/about.gotmpl
@@ -0,0 +1,5 @@
+{{ define "chart.about" }}
+## About
+
+This chart creates a monolith deployment, including an optionally enabled PostgreSQL dependency to connect to.
+{{ end }}
\ No newline at end of file
diff --git a/helm/dendrite/.helm-docs/appservices.gotmpl b/helm/dendrite/.helm-docs/appservices.gotmpl
new file mode 100644
index 000000000..8a79a0780
--- /dev/null
+++ b/helm/dendrite/.helm-docs/appservices.gotmpl
@@ -0,0 +1,5 @@
+{{ define "chart.appservices" }}
+## Usage with appservices
+
+Create a folder `appservices` and place your configurations in there.  The configurations will be read and placed in a secret `dendrite-appservices-conf`.
+{{ end }}
\ No newline at end of file
diff --git a/helm/dendrite/.helm-docs/database.gotmpl b/helm/dendrite/.helm-docs/database.gotmpl
new file mode 100644
index 000000000..e98931301
--- /dev/null
+++ b/helm/dendrite/.helm-docs/database.gotmpl
@@ -0,0 +1,25 @@
+{{ define "chart.dbCreation" }}
+## Manual database creation
+
+(You can skip this, if you're deploying the PostgreSQL dependency)
+
+You'll need to create the following databases before starting Dendrite (see [install.md](https://github.com/matrix-org/dendrite/blob/master/docs/INSTALL.md#configuration)):
+
+```postgres
+create database dendrite_federationapi;
+create database dendrite_mediaapi;
+create database dendrite_roomserver;
+create database dendrite_userapi_accounts;
+create database dendrite_keyserver;
+create database dendrite_syncapi;
+```
+
+or
+
+```bash
+for i in mediaapi syncapi roomserver federationapi keyserver userapi_accounts; do
+    sudo -u postgres createdb -O dendrite dendrite_$i
+done
+```
+
+{{ end }}
\ No newline at end of file
diff --git a/helm/dendrite/.helm-docs/state.gotmpl b/helm/dendrite/.helm-docs/state.gotmpl
new file mode 100644
index 000000000..2fe987ddd
--- /dev/null
+++ b/helm/dendrite/.helm-docs/state.gotmpl
@@ -0,0 +1,3 @@
+{{ define "chart.state" }} 
+Status: **NOT PRODUCTION READY**
+{{ end }}
\ No newline at end of file
diff --git a/helm/dendrite/Chart.yaml b/helm/dendrite/Chart.yaml
index f206f42e6..dc32e2482 100644
--- a/helm/dendrite/Chart.yaml
+++ b/helm/dendrite/Chart.yaml
@@ -1,4 +1,4 @@
-apiVersion: v1
+apiVersion: v2
 name: dendrite
 version: "0.10.8"
 appVersion: "0.10.8"
diff --git a/helm/dendrite/values.yaml b/helm/dendrite/values.yaml
index 703844caf..b2fc6e1ab 100644
--- a/helm/dendrite/values.yaml
+++ b/helm/dendrite/values.yaml
@@ -32,15 +32,13 @@ configuration:
     create: true
     # -- Use an existing secret
     existingSecret: ""
-    
   key_validity_period: 168h0m0s
 
-
   database:
     # -- Default database host
-    host:  ""
+    host: ""
     # -- Default database user
-    user:  ""
+    user: ""
     # -- Default database password
     password: ""
 
@@ -86,7 +84,7 @@ configuration:
     turn_username: ""
     # -- The TURN password
     turn_password: ""
-  
+
   rate_limiting:
     # -- Enable rate limiting
     enabled: true
@@ -172,7 +170,7 @@ clientapi:
 
     # -- enable reCAPTCHA registration
     enable_registration_captcha: false
-    # -- reCAPTCHA public key 
+    # -- reCAPTCHA public key
     recaptcha_public_key: ""
     # -- reCAPTCHA private key
     recaptcha_private_key: ""
@@ -206,13 +204,6 @@ mediaapi:
   - width: 640
     height: 480
     method: scale
-  #resources:
-  #  requests:
-  #    cpu: "160m"
-  #    memory: "128Mi"
-  #  limits:
-  #    cpu: "480m"
-  #    memory: "512Mi"
 
 syncapi:
   # -- This option controls which HTTP header to inspect to find the real remote IP
@@ -255,7 +246,7 @@ postgresql:
 ingress:
   # -- Create an ingress for a monolith deployment
   enabled: false
-  
+
   annotations: {}
   hosts: []
   tls: []