diff --git a/src/main/resources/config/application-dev.yml b/src/main/resources/config/application-dev.yml
index a92fe409..29b817ef 100644
--- a/src/main/resources/config/application-dev.yml
+++ b/src/main/resources/config/application-dev.yml
@@ -54,10 +54,16 @@ spring:
     # Remove 'faker' if you do not want the sample data to be loaded automatically
     contexts: dev
   mail:
-    host: localhost
-    port: 1025
-    username:
-    password:
+    host: mail.nerdfortress.dev
+    port: 587
+    username: crusadetracker@send.nerdfortress.dev  #Replace this field with your Gmail username.
+    password: '!k$yzY9h42@D'          #Replace this field with your Gmail password/App password.
+    protocol: smtp
+    tls: true
+    properties.mail.smtp:
+      auth: true
+      starttls.enable: true
+      ssl.trust: mail.nerdfortress.dev
   messages:
     cache-duration: PT1S # 1 second, see the ISO 8601 standard
   thymeleaf:
diff --git a/src/main/resources/config/application-prod.yml b/src/main/resources/config/application-prod.yml
index 9530afec..d48da496 100644
--- a/src/main/resources/config/application-prod.yml
+++ b/src/main/resources/config/application-prod.yml
@@ -50,10 +50,16 @@ spring:
   liquibase:
     contexts: prod
   mail:
-    host: localhost
-    port: 25
-    username:
-    password:
+    host: mail.nerdfortress.dev
+    port: 587
+    username: crusadetracker@send.nerdfortress.dev  #Replace this field with your Gmail username.
+    password: '!k$yzY9h42@D'          #Replace this field with your Gmail password/App password.
+    protocol: smtp
+    tls: true
+    properties.mail.smtp:
+      auth: true
+      starttls.enable: true
+      ssl.trust: mail.nerdfortress.dev
   thymeleaf:
     cache: true
 
diff --git a/src/main/resources/config/application.yml b/src/main/resources/config/application.yml
index 20539b0e..a23ef2b0 100644
--- a/src/main/resources/config/application.yml
+++ b/src/main/resources/config/application.yml
@@ -141,7 +141,7 @@ jhipster:
   #     allow-credentials: true
   #     max-age: 1800
   mail:
-    from: crusadetracker@localhost
+    from: crusadetracker@send.nerdfortress.dev
   swagger:
     default-include-pattern: /api/.*
     title: crusadetracker API