diff --git a/manifests/site.pp b/manifests/site.pp
index da5ae18b5f..9662fbbff3 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1182,10 +1182,8 @@ node /^openstackid-dev\d*\.openstack\.org$/ {
     app_key                             => hiera('openstackid_dev_app_key'),
     id_log_error_to_email               => 'openstack@tipit.net',
     id_log_error_from_email             => 'noreply@openstack.org',
-    email_driver                        => 'smtp',
-    email_smtp_server                   => 'smtp.sendgrid.net',
-    email_smtp_server_user              => hiera('openstackid_dev_smtp_user'),
-    email_smtp_server_password          => hiera('openstackid_dev_smtp_password'),
+    email_driver                        => 'sendgrid',
+    email_send_grid_api_key             => hiera('openstackid_dev_send_grid_api_key'),
     php_version                         => 7,
     mysql_ssl_enabled                   => true,
     mysql_ssl_ca_file_contents          => hiera('openstackid_dev_mysql_ssl_ca_file_contents'),
diff --git a/modules/openstack_project/manifests/openstackid_dev.pp b/modules/openstack_project/manifests/openstackid_dev.pp
index 142c86e13a..c9f83738c0 100644
--- a/modules/openstack_project/manifests/openstackid_dev.pp
+++ b/modules/openstack_project/manifests/openstackid_dev.pp
@@ -45,6 +45,7 @@ class openstack_project::openstackid_dev (
   $app_url = '',
   $app_key = '',
   $email_driver = 'mail',
+  $email_send_grid_api_key = '',
   $email_smtp_server = 'smtp.mailgun.org',
   $email_smtp_server_port = 587,
   $email_smtp_server_user = '',
@@ -108,6 +109,7 @@ class openstack_project::openstackid_dev (
     app_url                             => $app_url,
     app_key                             => $app_key,
     email_driver                        => $email_driver,
+    email_send_grid_api_key             => $email_send_grid_api_key,
     email_smtp_server                   => $email_smtp_server,
     email_smtp_server_port              => $email_smtp_server_port,
     email_smtp_server_user              => $email_smtp_server_user,