diff --git a/charts/incubator/dendrite/Chart.yaml b/charts/incubator/dendrite/Chart.yaml
index 58753370..58041209 100644
--- a/charts/incubator/dendrite/Chart.yaml
+++ b/charts/incubator/dendrite/Chart.yaml
@@ -1,9 +1,9 @@
 ---
 apiVersion: v2
-appVersion: 0.5.1
+appVersion: 0.6.0
 description: Dendrite Matrix Homeserver
 name: dendrite
-version: 1.0.2
+version: 2.0.0
 kubeVersion: ">=1.16.0-0"
 keywords:
   - dendrite
@@ -26,11 +26,13 @@ dependencies:
     version: 10.14.4
     repository: https://charts.bitnami.com/bitnami
     condition: postgresql.enabled
+  - name: nats
+    version: 0.12.1
+    repository: https://nats-io.github.io/k8s/helm/charts/
+    condition: nats.enabled
 annotations:
   artifacthub.io/changes: |
     - kind: changed
-      description: Upgraded `postgresql` image version to "14.1.0"
-    - kind: fixed
-      description: "`initdbScripts` are now actually actually loaded"
-    - kind: added
-      description: "`postgresqlUsername` is used in `initdbScripts` rather than hardcoded value"
+      description: NATS is now used instead of Kafka
+    - kind: changed
+      description: App version bumped to v0.6.0
diff --git a/charts/incubator/dendrite/templates/dendrite-config.yaml b/charts/incubator/dendrite/templates/dendrite-config.yaml
index 3d6e3862..0c986884 100644
--- a/charts/incubator/dendrite/templates/dendrite-config.yaml
+++ b/charts/incubator/dendrite/templates/dendrite-config.yaml
@@ -18,14 +18,16 @@ stringData:
       well_known_server_name: {{ default "" .Values.dendrite.global.well_known_server_name | quote }}
       trusted_third_party_id_servers:
       {{- toYaml .Values.dendrite.global.trusted_third_party_id_servers | nindent 8 }}
-      kafka:
+      jetstream:
+        addresses:
+          {{- if .Values.nats.enabled }}
+          - {{ include "nats.fullname" .Subcharts.nats  }}:4222
+          {{- else }}
+          []
+          {{- end }}
+        in_memory: {{ not .Values.persistence.jetstream.enabled }}
+        storage_path: {{ .Values.persistence.jetstream.mountPath }}
         topic_prefix: "Dendrite"
-        use_naffka: true
-        naffka_database:
-          connection_string: {{ $connectionString }}dendrite_naffka?sslmode=disable
-          max_open_conns: {{ .Values.dendrite.database.max_open_conns }}
-          max_idle_conns: {{ .Values.dendrite.database.max_idle_conns }}
-          conn_max_lifetime: {{ .Values.dendrite.database.conn_max_lifetime }}
       metrics:
         enabled: {{ default false .Values.dendrite.global.metrics.enabled }}
         basic_auth:
diff --git a/charts/incubator/dendrite/values.yaml b/charts/incubator/dendrite/values.yaml
index d44a477e..7276cdfd 100644
--- a/charts/incubator/dendrite/values.yaml
+++ b/charts/incubator/dendrite/values.yaml
@@ -47,6 +47,11 @@ persistence:
   media:
     enabled: false
     mountPath: &mediaPath /var/dendrite/media
+  # -- Configure Jetsream persistence. This is highly recommended in production.
+  # @default -- See values.yaml
+  jetstream:
+    enabled: false
+    mountPath: /var/dendrite/jetstream
 
 # -- Configuration for Dendrite.
 # For more information see [the sample
@@ -210,3 +215,12 @@ postgresql:
   persistence:
     enabled: false
   initdbScriptsConfigMap: "dendrite-postgresql-init-scripts"
+
+nats:
+  # -- Enable and configure NATS for dendrite. Can be disabled for monolith
+  # deployments - an internal NATS server will be used in its place.
+  # @default -- See value.yaml
+  enabled: false
+  image: nats:2.7.1-alpine
+  jetstream:
+    enabled: true