diff --git a/Gemfile.lock b/Gemfile.lock
index f8ba890..8f61b85 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -375,4 +375,4 @@ RUBY VERSION
    ruby 2.6.5p114
 
 BUNDLED WITH
-   2.1.4
+   2.2.5
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 93b7ede..28f3f78 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -76,10 +76,10 @@
   config.i18n.fallbacks = true
 
   ActionMailer::Base.smtp_settings = {
-    address: 'smtp.sendgrid.net',
+    address: ENV['SMTP_SERVER'],
     port: 587,
-    user_name: ENV['SENDGRID_USERNAME'],
-    password: ENV['SENDGRID_PASSWORD'],
+    user_name: ENV['SMTP_USERNAME'],
+    password: ENV['SMTP_PASSWORD'],
     domain: 'carbonneutralmap.org.uk',
     authentication: :plain,
     enable_starttls_auto: true