diff --git a/livekit-server/templates/configmap.yaml b/livekit-server/templates/configmap.yaml
index a44fc82..55ce1ab 100644
--- a/livekit-server/templates/configmap.yaml
+++ b/livekit-server/templates/configmap.yaml
@@ -1,7 +1,28 @@
+{{- $redisPassword := randAlphaNum 50 }}
+
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "livekit-server.fullname" . }}
 data:
   config.yaml: |
-{{ toYaml .Values.livekit | indent 4 }}
+{{- $livekit := deepCopy .Values.livekit }}
+{{- if .Values.autoGenerateRedisPassword }}
+{{-   $redis := default dict $livekit.redis }}
+{{- if not (empty $redis) }}
+{{-   $_ := set $redis "password" $redisPassword }}
+{{- end }}
+{{-   $livekit = merge $livekit (dict "redis" $redis) }}
+{{- end }}
+{{ toYaml $livekit | indent 4 }}
+---
+{{- if .Values.autoGenerateRedisPassword }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "livekit-server.fullname" . }}-redis
+  labels:
+    {{- include "livekit-server.labels" . | nindent 4 }}
+data:
+  redis_password: {{ $redisPassword | b64enc }}
+{{- end }}
\ No newline at end of file
diff --git a/livekit-server/values.yaml b/livekit-server/values.yaml
index bcf6d51..338c9ce 100644
--- a/livekit-server/values.yaml
+++ b/livekit-server/values.yaml
@@ -60,6 +60,10 @@ storeKeysInSecret:
     {}
     # key value pairs (<api_key>: >api_secret>)
 
+# If set to true, a random redis password is automatically generated and passed to the configmap. This also creates a secret containing the `redis_password` key
+# to be passed to your instance of redis as an existingSecret.
+autoGenerateRedisPassword: false
+
 nameOverride: ""
 fullnameOverride: ""