diff --git a/Documentation_Containers/bookstack/.env b/Documentation_Containers/bookstack/.env
index 3ab38e6..9bf0ecb 100644
--- a/Documentation_Containers/bookstack/.env
+++ b/Documentation_Containers/bookstack/.env
@@ -1,11 +1,9 @@
 SERVICE_NAME=wiki
 DOMAIN_NAME=example.com
-
 DB_PASSWORD=
-
 MAIL_DRIVER=smtp
 # SMTP server host address
-MAIL_HOST=smtp.provider.tld
+MAIL_HOST=smtp.mailgun.org
 # SMTP server port
 # Using port 465 will force connections to be via TLS
 MAIL_PORT=587
@@ -20,6 +18,6 @@ MAIL_ENCRYPTION=tls
 MAIL_USERNAME=user@provider.tld
 MAIL_PASSWORD=onlyifneeded
 # The "from" email address for outgoing email
-MAIL_FROM=noreply@yourdomain.tld  
+MAIL_FROM=noreply@${DOMAIN_NAME}
 # The "from" name used for outgoing email
-MAIL_FROM_NAME= ${DOMAIN_NAME} Wiki
\ No newline at end of file
+MAIL_FROM_NAME= ${DOMAIN_NAME} ${SERVICE_NAME}
\ No newline at end of file