diff --git a/.env.sample b/.env.sample
index 273e174..03f19c8 100644
--- a/.env.sample
+++ b/.env.sample
@@ -53,6 +53,9 @@ TIMEOUT=120
 #
 ## grafana SMTP configuration (optional)
 # GF_SMTP_HOST=changeme
-# GF_SMTP_ENABLED=1
+# GF_SMTP_USER=changme
+# GF_SMTP_ENABLED=true
 # GF_SMTP_FROM_ADDRESS=grafana@example.com
-# GF_SMTP_SKIP_VERIFY=1
+# GF_SMTP_SKIP_VERIFY=false
+# SECRET_GRAFANA_SMTP_PASSWORD_VERSION=v1
+#
\ No newline at end of file
diff --git a/compose.grafana.yml b/compose.grafana.yml
index a9758a2..6450f7f 100644
--- a/compose.grafana.yml
+++ b/compose.grafana.yml
@@ -8,6 +8,7 @@ services:
     secrets:
       - grafana_admin_password
       - grafana_oidc_client_secret
+      - grafana_smtp_password
     configs:
       - source: grafana_custom_ini
         target: /etc/grafana/grafana.ini
@@ -28,6 +29,8 @@ services:
       - GF_SERVER_ROOT_URL
       - GF_SECURITY_ADMIN_PASSWORD__FILE=/run/secrets/grafana_admin_password
       - GF_SMTP_HOST
+      - GF_SMTP_USER
+      - GF_SMTP_PASSWORD__FILE=/run/secrets/grafana_smtp_password
       - GF_SMTP_ENABLED
       - GF_SMTP_FROM_ADDRESS
       - GF_SMTP_SKIP_VERIFY
@@ -85,3 +88,6 @@ secrets:
   grafana_oidc_client_secret:
     external: true
     name: ${STACK_NAME}_grafana_oidc_client_secret_${SECRET_GRAFANA_OIDC_CLIENT_SECRET_VERSION}
+  grafana_smtp_password:
+    external: true
+    name: ${STACK_NAME}_grafana_smtp_password_${SECRET_GRAFANA_SMTP_PASSWORD_VERSION}