diff --git a/gitlab.rb.tmpl b/gitlab.rb.tmpl
index cf19a8e..6f48a52 100644
--- a/gitlab.rb.tmpl
+++ b/gitlab.rb.tmpl
@@ -2296,17 +2296,17 @@ registry_nginx['listen_https'] = false
 # See: http://docs.grafana.org/administration/configuration/#smtp
 #
 # grafana['smtp'] = {
-#   'enabled' => true,
-#   'host' => 'localhost:25',
-#   'user' => nil,
-#   'password' => nil,
+#   'enabled' => {{ env "SMTP_ENABLE_FLAG" }},
+#   'host' => '{{ env "SMTP_HOST" }}:{{ env "SMTP_PORT" }}',
+#   'user' => {{ env "SMTP_USER" }},
+#   'password' => {{ secret "smtp_password" }},
 #   'cert_file' => nil,
 #   'key_file' => nil,
 #   'skip_verify' => false,
-#   'from_address' => 'admin@grafana.localhost',
-#   'from_name' => 'Grafana',
-#   'ehlo_identity' => 'dashboard.example.com',
-#   'startTLS_policy' => nil
+#   'from_address' => '{{ env "SMTP_FROM_ADDRESS" }}',
+#   'from_name' => '{{ env "SMTP_FROM_NAME" }}',
+#   'ehlo_identity' => '{{ env "SMTP_EHLO" }}',
+#   'startTLS_policy' => {{ env "SMTP_STARTTLS_FLAG" }}
 # }
 
 # Grafana usage reporting defaults to gitlab_rails['usage_ping_enabled']