diff --git a/.env b/.env
index 0b46463..35cca0a 100644
--- a/.env
+++ b/.env
@@ -6,3 +6,7 @@ MQTT_CLIENT=local
 APP_MAIL_USERNAME=final.iot.backend.mailer@gmail.com
 APP_MAIL_PASSWORD=FinalIoT1234
 FLASK_ENV=development
+MAILGUN_SMTP_SERVER=smtp.googlemail.com
+MAILGUN_SMPT_PORT=465
+MAILGUN_SMPT_LOGIN=final.iot.backend.mailer@gmail.com
+MAILGUN_SMPT_PASSWORD=FinalIoT1234
diff --git a/config.py b/config.py
index f084368..725d035 100644
--- a/config.py
+++ b/config.py
@@ -42,15 +42,15 @@ CELERY_BROKER_URL = os.environ['REDIS_URL']
 CELERY_RESULT_BACKEND = os.environ['REDIS_URL']
 
 # Mailer config
-MAIL_SERVER = 'smtp.googlemail.com'
-MAIL_PORT = 465
+MAIL_SERVER = os.environ['MAILGUN_SMTP_SERVER']
+MAIL_PORT = os.environ['MAILGUN_SMTP_PORT']
 MAIL_USE_TLS = False
 MAIL_USE_SSL = True
 MAIL_DEBUG = False
 
 # gmail authentication
-MAIL_USERNAME = os.environ['APP_MAIL_USERNAME']
-MAIL_PASSWORD = os.environ['APP_MAIL_PASSWORD']
+MAIL_USERNAME = os.environ['MAILGUN_SMTP_LOGIN']
+MAIL_PASSWORD = os.environ['MAILGUN_SMTP_PASSWORD']
 
 # mail accounts
 MAIL_DEFAULT_SENDER = 'final.iot.backend.mailer@gmail.com'