diff --git a/docker-compose.yml b/docker-compose.yml
index 297126a5..502dc8b6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -30,6 +30,9 @@ services:
       - DEFAULT_ADMIN_NAME=Demo Demo
       - DEFAULT_ADMIN_USERNAME=demo
 
+      - MAIL_HOST=smtp.gmail.com
+
+
       # related: https://github.com/knex/knex/issues/2354
       # As knex does not pass query parameters from the connection string we
       # have to use environment variables in order to pass the desired values, e.g.
diff --git a/server/config/custom.js b/server/config/custom.js
index 245ac671..583b9ce4 100644
--- a/server/config/custom.js
+++ b/server/config/custom.js
@@ -44,7 +44,7 @@ module.exports.custom = {
   defaultAdminEmail: process.env.DEFAULT_ADMIN_EMAIL,
 
   mailConnectorHost: process.env.MAIL_HOST,
-  mailConnectorPort: process.env.MAIL_PORT || 587,
+  mailConnectorPort: process.env.MAIL_PORT || 25,
   mailConnectorEmail: 'Planka <planka-noreplay@test.com>',
   mailConnectorUser: process.env.MAIL_USER,
   mailConnectorPass: process.env.MAIL_PASSWORD,