diff --git a/config/settings/container/base.py b/config/settings/container/base.py
index d2277c2c2123bb32aee0c9c7b761cd428c430e66..9209efcf80fb385b147bf09f7c6213b63fc0650c 100644
--- a/config/settings/container/base.py
+++ b/config/settings/container/base.py
@@ -109,10 +109,10 @@ if hosts_from_env is not None:
 ALLOWED_HOSTS += [SERVER_FQDN]
 
 # Email settings - dependent on server hostname and FQDN ----------------------
-SERVER_EMAIL = 'GraceDB <gracedb@{fqdn}>'.format(fqdn=SERVER_FQDN)
+SERVER_EMAIL = ALERT_EMAIL_FROM
 ALERT_EMAIL_TO = []
 ALERT_EMAIL_BCC = []
-ALERT_TEST_EMAIL_FROM = SERVER_EMAIL
+ALERT_TEST_EMAIL_FROM = ALERT_EMAIL_FROM
 ALERT_TEST_EMAIL_TO = []
 # EMBB email settings
 EMBB_MAIL_ADDRESS = 'embb@{fqdn}.ligo.org'.format(fqdn=SERVER_FQDN)