diff --git a/config/environments/production.rb b/config/environments/production.rb
index db88a7023..815489ccd 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -88,12 +88,12 @@
   config.action_mailer.default_options = {from: ENV['MAIL_FROM']}
 
   config.action_mailer.smtp_settings = {
-      :address        => 'smtp.sendgrid.net',
+      :address        => ENV.fetch('SENDGRID_ADDRESS'),
       :port           => '587',
       :authentication => :plain,
-      :user_name      => "apikey",
-      :password       => ENV['SENDGRID_API_KEY'],
-      :domain         => 'heroku.com',
+      :user_name      => ENV.fetch('SENDGRID_USERNAME'),
+      :password       => ENV.fetch('SENDGRID_PASSWORD'),
+      :domain         => ENV.fetch('SENDGRID_DOMAIN'),
       :enable_starttls_auto => true
   }