diff --git a/puppet/kandra/manifests/profile/grafana.pp b/puppet/kandra/manifests/profile/grafana.pp
index 6c401070e0..ce5ce07df5 100644
--- a/puppet/kandra/manifests/profile/grafana.pp
+++ b/puppet/kandra/manifests/profile/grafana.pp
@@ -56,6 +56,10 @@ class kandra::profile::grafana inherits kandra::profile::base {
     notify  => Service[supervisor],
   }
 
+  $email_host = zulipconf('grafana', 'email_host', '')
+  $email_from = zulipconf('grafana', 'email_from', '')
+  $email_user = zulipsecret('secrets', 'grafana_email_user', '')
+  $email_password = zulipsecret('secrets', 'grafana_email_password', '')
   file { '/etc/grafana':
     ensure => directory,
     owner  => 'root',
@@ -63,11 +67,11 @@ class kandra::profile::grafana inherits kandra::profile::base {
     mode   => '0755',
   }
   file { '/etc/grafana/grafana.ini':
-    ensure => file,
-    owner  => 'root',
-    group  => 'root',
-    mode   => '0644',
-    source => 'puppet:///modules/kandra/grafana/grafana.ini',
-    notify => Service[supervisor],
+    ensure  => file,
+    owner   => 'root',
+    group   => 'root',
+    mode    => '0644',
+    content => template('kandra/grafana.ini.template.erb'),
+    notify  => Service[supervisor],
   }
 }
diff --git a/puppet/kandra/files/grafana/grafana.ini b/puppet/kandra/templates/grafana.ini.template.erb
similarity index 86%
rename from puppet/kandra/files/grafana/grafana.ini
rename to puppet/kandra/templates/grafana.ini.template.erb
index 520052ffa7..162591174e 100644
--- a/puppet/kandra/files/grafana/grafana.ini
+++ b/puppet/kandra/templates/grafana.ini.template.erb
@@ -29,6 +29,17 @@ domain = monitoring.teleport.zulipchat.net
 root_url = https://monitoring.teleport.zulipchat.net/
 
 
+#################################### SMTP ####################################
+[smtp]
+enabled = true
+from_name = Grafana
+from_address = <%= @email_from %>
+host = <%= @email_host %>
+user = <%= @email_user %>
+password = <%= @email_password %>
+startTLS_policy = MandatoryStartTLS
+
+
 #################################### Auth JWT ####################################
 [auth.jwt]
 # Grafana should trust the JWT that is provided in a header from Teleport; see