diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl
index dcf5478..8d8c4ec 100644
--- a/templates/_helpers.tpl
+++ b/templates/_helpers.tpl
@@ -164,8 +164,10 @@ Get the redis secret.
     {{- printf "%s" (tpl .Values.redis.auth.existingSecret $) -}}
 {{- else if .Values.redis.existingSecret }}
     {{- printf "%s" (tpl .Values.redis.existingSecret $) -}}
-{{- else -}}
+{{- else if .Values.redis.enabled -}}
     {{- printf "%s-redis" (tpl .Release.Name $) -}}
+{{- else -}}
+    {{- printf "%s-redis" (include "mastodon.fullname" .) -}}
 {{- end -}}
 {{- end -}}
 
diff --git a/templates/deployment-sidekiq.yaml b/templates/deployment-sidekiq.yaml
index 550cc15..82e045b 100644
--- a/templates/deployment-sidekiq.yaml
+++ b/templates/deployment-sidekiq.yaml
@@ -83,8 +83,10 @@ spec:
       {{- end }}
       containers:
         - name: {{ $context.Chart.Name }}
+          {{- with $context.Values.mastodon.sidekiq.securityContext | default $context.Values.securityContext }}
           securityContext:
-            {{- toYaml $context.Values.mastodon.sidekiq.securityContext | nindent 12 }}
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
           image: "{{ coalesce (dig "image" "repository" false .) $context.Values.image.repository }}:{{ coalesce (dig "image" "tag" false .) $context.Values.image.tag $context.Chart.AppVersion }}"
           imagePullPolicy: {{ $context.Values.image.pullPolicy }}
           command:
diff --git a/templates/secret-redis.yaml b/templates/secret-redis.yaml
new file mode 100644
index 0000000..b1d8ac1
--- /dev/null
+++ b/templates/secret-redis.yaml
@@ -0,0 +1,15 @@
+{{- if not .Values.redis.enabled }}
+{{- if and (not .Values.redis.auth.existingSecret) (not .Values.redis.existingSecret) }}
+{{- if .Values.redis.auth.password }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "mastodon.redis.secretName" . }}
+  labels:
+    {{- include "mastodon.labels" . | nindent 4 }}
+type: Opaque
+data:
+  redis-password: "{{ .Values.redis.auth.password | b64enc }}"
+{{- end }}
+{{- end }}
+{{- end }}
diff --git a/values.yaml b/values.yaml
index eaebc98..bd340b7 100644
--- a/values.yaml
+++ b/values.yaml
@@ -447,6 +447,7 @@ redis:
     # -- you must set a password; the password generated by the redis chart will be
     # rotated on each upgrade:
     password: ""
+    # setting password for an existing redis instance will store it in a new Secret
     # you can also specify the name of an existing Secret
     # with a key of redis-password set to the password you want
     # existingSecret: ""