diff --git a/manifests/site.pp b/manifests/site.pp
index 8f8f0e8253..4f98931c9c 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -614,6 +614,7 @@ node 'storyboard.openstack.org' {
       "https://${::fqdn}",
       'http://docs-draft.openstack.org',
     ],
+    sender_email_address => 'storyboard@storyboard.openstack.org',
   }
 }
 
diff --git a/modules/openstack_project/manifests/storyboard.pp b/modules/openstack_project/manifests/storyboard.pp
index b4dcdfaa40..ec08962c0a 100644
--- a/modules/openstack_project/manifests/storyboard.pp
+++ b/modules/openstack_project/manifests/storyboard.pp
@@ -15,6 +15,7 @@ class openstack_project::storyboard(
   $hostname = $::fqdn,
   $valid_oauth_clients = [$::fqdn],
   $cors_allowed_origins = ["https://${::fqdn}"],
+  $sender_email_address = undef,
 ) {
 
   class { 'project_config':
@@ -94,6 +95,7 @@ class openstack_project::storyboard(
     rabbitmq_vhost         => '/',
     rabbitmq_user          => $rabbitmq_user,
     rabbitmq_user_password => $rabbitmq_password,
+    sender_email_address   => $sender_email_address,
   }
 
   class { '::storyboard::rabbit':