diff --git a/dockers/mastodon/docker-compose.yml b/dockers/mastodon/docker-compose.yml
index f36066e..d3197a1 100644
--- a/dockers/mastodon/docker-compose.yml
+++ b/dockers/mastodon/docker-compose.yml
@@ -64,6 +64,11 @@ services:
     container_name: ${mastodonServName}
     image: ghcr.io/mastodon/mastodon:v4.3.6
     restart: ${restartPolicy}
+    environment:
+      - LOCAL_DOMAIN=${mastodonHost}.${domain}
+      - SMTP_SERVER=smtp.${domain}
+      - SMTP_LOGIN=admin@${domain}
+      - SMTP_FROM_ADDRESS=admin@${domain}
     env_file:
       - env-config
       - ../../secret/env-mastodonServ
@@ -96,6 +101,11 @@ services:
     container_name: ${mastodonStreamingName}
     image: ghcr.io/mastodon/mastodon-streaming:v4.3.6
     restart: ${restartPolicy}
+    environment:
+      - LOCAL_DOMAIN=${mastodonHost}.${domain}
+      - SMTP_SERVER=smtp.${domain}
+      - SMTP_LOGIN=admin@${domain}
+      - SMTP_FROM_ADDRESS=admin@${domain}
     env_file:
       - env-config
       - ../../secret/env-mastodonServ
@@ -122,6 +132,11 @@ services:
     container_name: ${mastodonSidekiqName}
     image: ghcr.io/mastodon/mastodon:v4.3.6
     restart: ${restartPolicy}
+    environment:
+      - LOCAL_DOMAIN=${mastodonHost}.${domain}
+      - SMTP_SERVER=smtp.${domain}
+      - SMTP_LOGIN=admin@${domain}
+      - SMTP_FROM_ADDRESS=admin@${domain}
     env_file:
       - env-config
       - ../../secret/env-mastodonServ
diff --git a/dockers/mastodon/env-config b/dockers/mastodon/env-config
index b23ff94..2ff19d9 100644
--- a/dockers/mastodon/env-config
+++ b/dockers/mastodon/env-config
@@ -67,7 +67,7 @@ ES_PASS=password
 # Sending mail
 # ------------
 #SMTP_SERVER=
-#SMTP_PORT=
+SMTP_PORT=587
 #SMTP_LOGIN=
 #SMTP_PASSWORD=
 #SMTP_FROM_ADDRESS=