diff --git a/amp/templates/service.yaml b/amp/templates/service.yaml
index 00091087e8bf00c3721d9e64fc3327539f1ef7d8..5e075f9801a642f3f6cc16327b5a6c4a23d050a9 100644
--- a/amp/templates/service.yaml
+++ b/amp/templates/service.yaml
@@ -17,7 +17,7 @@ spec:
       targetPort: http
     {{- range .Values.gamePorts }}
     - name: {{ .name }}
-      port: {{ .port}}
+      port: {{ .port }}
       targetPort: {{ .name }}
       protocol: {{ .protocol }}
     {{- end }}
diff --git a/mastodon/Chart.yaml b/mastodon/Chart.yaml
index bf7a8674c1e7e00455d43411c9c9843c22419405..e88423a75cbeac2f7cd0f55092074c03d1fe34c7 100644
--- a/mastodon/Chart.yaml
+++ b/mastodon/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: mastodon
 description: Helm Chart for mastodon
 type: application
-version: 0.5.0
-appVersion: "v4.2"
+version: 0.6.2
+appVersion: "v4.3"
diff --git a/mastodon/templates/secret.yaml b/mastodon/templates/secret.yaml
index e9f607601f822392f7f85ab6bb9479796ea2d3eb..b68c1433aed7cc5860f184bc54b647ed2663dfc2 100644
--- a/mastodon/templates/secret.yaml
+++ b/mastodon/templates/secret.yaml
@@ -18,8 +18,8 @@ stringData:
   # See: https://github.com/mastodon/mastodon/issues/16895
 
   # Mode
-  RAILS_ENV: production
-  NODE_ENV: production
+  RAILS_ENV: "production"
+  NODE_ENV: "production"
 
   # Federation and access
   # ----------
@@ -65,6 +65,14 @@ stringData:
   VAPID_PRIVATE_KEY: "{{ .Values.keys.vapidPrivate }}"
   VAPID_PUBLIC_KEY: "{{ .Values.keys.vapidPublic }}"
 
+  # Active Record Encryption
+  # --------
+  # Generate with `bin/rails db:encryption:init`
+  # --------
+  ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY: "{{ .Values.keys.encryptionDeterministicKey }}"
+  ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT: "{{ .Values.keys.encryptionDerivationSalt }}"
+  ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY: "{{ .Values.keys.encryptionPrimaryKey }}"
+
   # Sending mail
   # ------------
   SMTP_SERVER: "{{ .Values.smtp.hostname }}"
diff --git a/mastodon/values.yaml b/mastodon/values.yaml
index 125d5eca6b3a24e3bd9dcb1cfe0d44fdb23d5f1d..ff286076c4847886c087811fa22d8538eaea63e8 100644
--- a/mastodon/values.yaml
+++ b/mastodon/values.yaml
@@ -17,7 +17,7 @@ web:
       memory: 64Mi
 
 streaming:
-  repository: tootsuite/mastodon
+  repository: tootsuite/mastodon-streaming
   pullPolicy: Always
   tag: ""
   resources:
@@ -52,6 +52,10 @@ keys:
   # Generate with `rake mastodon:webpush:generate_vapid_key`
   vapidPrivate: ""
   vapidPublic: ""
+  # Generate with `bin/rails db:encryption:init`
+  encryptionDeterministicKey: ""
+  encryptionDerivationSalt: ""
+  encryptionPrimaryKey: ""
 
 redis:
   hostname: "example.com"