diff --git a/src/main/resources/config/application-dev.yml b/src/main/resources/config/application-dev.yml
index 47d02ed..0135be2 100644
--- a/src/main/resources/config/application-dev.yml
+++ b/src/main/resources/config/application-dev.yml
@@ -42,14 +42,15 @@ spring:
     # Remove 'faker' if you do not want the sample data to be loaded automatically
     contexts: dev, faker
   mail:
-    host: smtps.aruba.it
-    port: 465
-    username: noreply@bigc.it
-    password: Ungr@nb3l4n1m4l0
-    protocol: smtps
+    host: mail-eu.smtp2go.com
+    port: 587
+    username: artegna
+    password: gpTottUCcB9GKG15
+    protocol: smtp
     properties.mail.smtp:
       auth: true
       starttls.enable: true
+      starttls.required: true
 
   messages:
     cache-duration: PT1S # 1 second, see the ISO 8601 standard
diff --git a/src/main/resources/config/application-prod.yml b/src/main/resources/config/application-prod.yml
index b18ff38..0bb5214 100644
--- a/src/main/resources/config/application-prod.yml
+++ b/src/main/resources/config/application-prod.yml
@@ -43,14 +43,15 @@ spring:
   liquibase:
     contexts: prod
   mail:
-    host: smtps.aruba.it
-    port: 465
-    username: noreply@bigc.it
-    password: Ungr@nb3l4n1m4l0
-    protocol: smtps
+    host: mail-eu.smtp2go.com
+    port: 587
+    username: artegna
+    password: gpTottUCcB9GKG15
+    protocol: smtp
     properties.mail.smtp:
       auth: true
       starttls.enable: true
+      starttls.required: true
   thymeleaf:
     cache: true