Index: grails-app/conf/spring/resources.groovy
===================================================================
diff -u -r751a531b0e8dd70db9a04e8709886c33966640e5 -rca0ca77914d1f129e95619e0ced3677113561714
--- grails-app/conf/spring/resources.groovy	(.../resources.groovy)	(revision 751a531b0e8dd70db9a04e8709886c33966640e5)
+++ grails-app/conf/spring/resources.groovy	(.../resources.groovy)	(revision ca0ca77914d1f129e95619e0ced3677113561714)
@@ -26,9 +26,7 @@
         jiraDigiQCUserName(java.lang.String, 'jira_prod@parts-unltd.com')
         jiraDigiQCPassword(java.lang.String, 'P5o4mRDWlh8drgwCxg1KC593')
         jiraDigiQCPartEpic(java.lang.String, 'DSIP-191')
-
-        mailSender(JavaMailSenderImpl) { host = 'localhost' }
-
+        emailHost(String, 'localhost')
     } else {
         authServiceContext(org.springframework.jndi.JndiObjectFactoryBean) {
             jndiName = 'java:comp/env/authServiceContext'
@@ -82,7 +80,13 @@
         jiraDigiQCPartEpic(org.springframework.jndi.JndiObjectFactoryBean) {
             jndiName = 'java:comp/env/jiraDigiQCPartEpic'
         }
-        mailSender(JavaMailSenderImpl) { host = 'smtp.lemanscorp.com' }
+        emailHost(String, 'smtp.office365.com')
+        servicesMailSecurityUsername(org.springframework.jndi.JndiObjectFactoryBean) {
+            jndiName = 'java:comp/env/servicesMailSecurityUsername'
+        }
+        servicesMailSecurityPassword(org.springframework.jndi.JndiObjectFactoryBean) {
+            jndiName = 'java:comp/env/servicesMailSecurityPassword'
+        }
     }
 
     ssrReporter(SsrReporter) {
@@ -93,6 +97,25 @@
 
     hiddenChangeLogEmail(java.lang.String, 'vramisetti@parts-unltd.com')
 
+    if (current == Environment.PRODUCTION) {
+        mailSender(JavaMailSenderImpl) {
+            host = ref('emailHost')
+            port = 587
+            username = ref('servicesMailSecurityUsername')
+            password = ref('servicesMailSecurityPassword')
+            javaMailProperties = [
+                    'mail.smtp.auth'     : 'true',
+                    'mail.smtp.starttls.enable': 'true',
+                    'mail.smtp.ssl.protocols': 'TLSv1.2 TLSv1.3'
+            ]
+        }
+    } else {
+        mailSender(JavaMailSenderImpl) {
+            host = ref('emailHost')
+        }
+    }
+
+
     if (current != Environment.PRODUCTION) {
         dumbster(Dumbster) { bean ->
             grailsApplication = application