diff --git a/charts/pixelfed/templates/secret_mail.yaml b/charts/pixelfed/templates/secret_mail.yaml
index bf8c481..d91618e 100644
--- a/charts/pixelfed/templates/secret_mail.yaml
+++ b/charts/pixelfed/templates/secret_mail.yaml
@@ -3,7 +3,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: pixelfed-mail
+  name: {{ include "pixelfed.fullname" . }}-mail
 data:
   host: {{ .Values.pixelfed.mail.host | b64enc }}
   port: {{ .Values.pixelfed.mail.port | quote | b64enc}}
diff --git a/charts/pixelfed/templates/secret_valkey.yaml b/charts/pixelfed/templates/secret_valkey.yaml
index cd55d57..bbfab16 100644
--- a/charts/pixelfed/templates/secret_valkey.yaml
+++ b/charts/pixelfed/templates/secret_valkey.yaml
@@ -3,7 +3,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: pixelfed-valkey
+  name: {{ include "pixelfed.fullname" . }}-valkey
 data:
   host: {{ .Values.externalValkey.host | b64enc }}
   port: {{ .Values.externalValkey.port | quote | b64enc  }}