diff --git a/.env.base b/.env.base
index b2bc0a52df..38504067a9 100644
--- a/.env.base
+++ b/.env.base
@@ -81,7 +81,9 @@ MAIL_HOST=smtp.mailtrap.io
 MAIL_PORT=2525
 MAIL_USERNAME=null
 MAIL_PASSWORD=null
-MAIL_SCHEME=null
+MAIL_ENCRYPTION=null
+MAIL_FROM_ADDRESS=noreply@restarters.test
+MAIL_FROM_NAME=Restarters
 
 # =============================================================================
 # PUSHER CONFIGURATION
diff --git a/.env.template b/.env.template
index 2179394a9a..41f8a35131 100644
--- a/.env.template
+++ b/.env.template
@@ -81,7 +81,9 @@ MAIL_HOST="$MAIL_HOST"
 MAIL_PORT="$MAIL_PORT"
 MAIL_USERNAME="$MAIL_USERNAME"
 MAIL_PASSWORD="$MAIL_PASSWORD"
-MAIL_SCHEME="$MAIL_SCHEME"
+MAIL_ENCRYPTION="$MAIL_ENCRYPTION"
+MAIL_FROM_ADDRESS="$MAIL_FROM_ADDRESS"
+MAIL_FROM_NAME="$MAIL_FROM_NAME"
 
 # =============================================================================
 # PUSHER CONFIGURATION
diff --git a/charts/restarters/Chart.yaml b/charts/restarters/Chart.yaml
index cde50e2ff6..1bc2e2dcc8 100644
--- a/charts/restarters/Chart.yaml
+++ b/charts/restarters/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.2.0
+version: 0.2.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/restarters/templates/_helpers.tpl b/charts/restarters/templates/_helpers.tpl
index 37db9c0bba..a252fcb61f 100644
--- a/charts/restarters/templates/_helpers.tpl
+++ b/charts/restarters/templates/_helpers.tpl
@@ -91,6 +91,16 @@ Helper to generate environment variables from secrets
     secretKeyRef:
       name: {{ .Values.secrets.dbCredentials.secretName }}
       key: {{ .Values.secrets.dbCredentials.keys.dbPassword }}
+- name: MAIL_USERNAME
+  valueFrom:
+    secretKeyRef:
+      name: {{ .Values.secrets.mailCredentials.secretName }}
+      key: {{ .Values.secrets.mailCredentials.keys.mailUsername }}
+- name: MAIL_PASSWORD
+  valueFrom:
+    secretKeyRef:
+      name: {{ .Values.secrets.mailCredentials.secretName }}
+      key: {{ .Values.secrets.mailCredentials.keys.mailPassword }}
 {{- end }}
 
 {{/*
diff --git a/charts/restarters/templates/secrets.yaml b/charts/restarters/templates/secrets.yaml
index ec5fa83b83..f4cc45fed3 100644
--- a/charts/restarters/templates/secrets.yaml
+++ b/charts/restarters/templates/secrets.yaml
@@ -29,3 +29,17 @@ data:
   {{ .Values.secrets.dbCredentials.keys.dbUsername }}: {{ .Values.secrets.dbCredentials.data.dbUsername | b64enc | quote }}
   {{ .Values.secrets.dbCredentials.keys.dbPassword }}: {{ .Values.secrets.dbCredentials.data.dbPassword | b64enc | quote }}
 {{- end }}
+
+{{- if .Values.secrets.mailCredentials.createSecret }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ .Values.secrets.mailCredentials.secretName }}
+  labels:
+    {{- include "restarters.labels" . | nindent 4 }}
+type: Opaque
+data:
+  {{ .Values.secrets.mailCredentials.keys.mailUsername }}: {{ .Values.secrets.mailCredentials.data.mailUsername | b64enc | quote }}
+  {{ .Values.secrets.mailCredentials.keys.mailPassword }}: {{ .Values.secrets.mailCredentials.data.mailPassword | b64enc | quote }}
+{{- end }}
\ No newline at end of file
diff --git a/charts/restarters/values.yaml b/charts/restarters/values.yaml
index f5a4af6a4c..0de524e348 100644
--- a/charts/restarters/values.yaml
+++ b/charts/restarters/values.yaml
@@ -199,6 +199,18 @@ secrets:
       dbDatabase: "your-db-database-here"
       dbUsername: "your-db-username-here"
       dbPassword: "your-db-password-here"
+  # Mail credentials
+  # IMPORTANT: For production deployments, create the secret externally and set createSecret: false
+  # For development, you can set createSecret: true and provide values in the data section
+  mailCredentials:
+    createSecret: true
+    secretName: "restarters-mail-credentials"
+    keys:
+      mailUsername: "MAIL_USERNAME"
+      mailPassword: "MAIL_PASSWORD"
+    data:
+      mailUsername: "your-mail-username-here"
+      mailPassword: "your-mail-password-here"
 
 # Environment variable groups - organized by functionality
 envGroups:
@@ -263,9 +275,9 @@ envGroups:
     MAIL_MAILER: "smtp"
     MAIL_HOST: "mailpit"
     MAIL_PORT: "1025"
-    MAIL_USERNAME: "null"
-    MAIL_PASSWORD: "null"
-    MAIL_SCHEME: "null"
+    MAIL_ENCRYPTION: "null"
+    MAIL_FROM_ADDRESS: "noreply@restarters.test"
+    MAIL_FROM_NAME: "Restarters"
 
   # Pusher configuration
   pusher: