diff --git a/.env b/.env
index f8777509a3..6583a94fc8 100644
--- a/.env
+++ b/.env
@@ -1,5 +1,8 @@
 _APP_ENV=production
 _APP_ENV=development
+_APP_SYSTEM_EMAIL_NAME=Appwrite
+_APP_SYSTEM_EMAIL_ADDRESS=team@appwrite.io
+_APP_SYSTEM_SECURITY_EMAIL_ADDRESS=security@appwrite.io
 _APP_OPTIONS_ABUSE=disabled
 _APP_OPTIONS_FORCE_HTTPS=disabled
 _APP_OPENSSL_KEY_V1=your-secret-key
diff --git a/app/views/install/compose.phtml b/app/views/install/compose.phtml
index 7df932c9e2..66583c380a 100644
--- a/app/views/install/compose.phtml
+++ b/app/views/install/compose.phtml
@@ -52,6 +52,9 @@ services:
       - influxdb
     environment:
       - _APP_ENV
+      - _APP_SYSTEM_EMAIL_NAME
+      - _APP_SYSTEM_EMAIL_ADDRESS
+      - _APP_SYSTEM_SECURITY_EMAIL_ADDRESS
       - _APP_OPTIONS_ABUSE
       - _APP_OPTIONS_FORCE_HTTPS
       - _APP_OPENSSL_KEY_V1
@@ -119,6 +122,7 @@ services:
       - mariadb
     environment:
       - _APP_ENV
+      - _APP_SYSTEM_SECURITY_EMAIL_ADDRESS
       - _APP_REDIS_HOST
       - _APP_REDIS_PORT
       - _APP_DB_HOST
@@ -139,6 +143,7 @@ services:
       - mariadb
     environment:
       - _APP_ENV
+      - _APP_SYSTEM_SECURITY_EMAIL_ADDRESS
       - _APP_REDIS_HOST
       - _APP_REDIS_PORT
       - _APP_DB_HOST
@@ -185,6 +190,7 @@ services:
       - appwrite-certificates:/storage/certificates:rw
     environment:
       - _APP_ENV
+      - _APP_SYSTEM_SECURITY_EMAIL_ADDRESS
       - _APP_REDIS_HOST
       - _APP_REDIS_PORT
       - _APP_DB_HOST
@@ -231,6 +237,8 @@ services:
       - smtp
     environment:
       - _APP_ENV
+      - _APP_SYSTEM_EMAIL_NAME
+      - _APP_SYSTEM_EMAIL_ADDRESS
       - _APP_REDIS_HOST
       - _APP_REDIS_PORT
       - _APP_SMTP_HOST
diff --git a/app/workers/certificates.php b/app/workers/certificates.php
index 4b81a9ea9a..421bd57019 100644
--- a/app/workers/certificates.php
+++ b/app/workers/certificates.php
@@ -115,7 +115,7 @@ class CertificatesV1
         $staging = (App::isProduction()) ? '' : ' --dry-run';
 
         $response = \shell_exec("certbot certonly --webroot --noninteractive --agree-tos{$staging} \
-            --email ".App::getEnv('_APP_SYSTEM_EMAIL_ADDRESS', 'security@localhost.test')." \
+            --email ".App::getEnv('_APP_SYSTEM_SECURITY_EMAIL_ADDRESS', 'security@localhost.test')." \
             -w ".APP_STORAGE_CERTIFICATES." \
             -d {$domain->get()}");
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 132fe9f2c2..599bbe380a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -66,6 +66,9 @@ services:
       - influxdb
     environment:
       - _APP_ENV
+      - _APP_SYSTEM_EMAIL_NAME
+      - _APP_SYSTEM_EMAIL_ADDRESS
+      - _APP_SYSTEM_SECURITY_EMAIL_ADDRESS
       - _APP_OPTIONS_ABUSE
       - _APP_OPTIONS_FORCE_HTTPS
       - _APP_OPENSSL_KEY_V1
@@ -136,6 +139,7 @@ services:
       - mariadb
     environment:
       - _APP_ENV
+      - _APP_SYSTEM_SECURITY_EMAIL_ADDRESS
       - _APP_REDIS_HOST
       - _APP_REDIS_PORT
       - _APP_DB_HOST
@@ -157,6 +161,7 @@ services:
       - mariadb
     environment:
       - _APP_ENV
+      - _APP_SYSTEM_SECURITY_EMAIL_ADDRESS
       - _APP_REDIS_HOST
       - _APP_REDIS_PORT
       - _APP_DB_HOST
@@ -205,6 +210,7 @@ services:
       - appwrite-certificates:/storage/certificates:rw
     environment:
       - _APP_ENV
+      - _APP_SYSTEM_SECURITY_EMAIL_ADDRESS
       - _APP_REDIS_HOST
       - _APP_REDIS_PORT
       - _APP_DB_HOST
@@ -254,6 +260,8 @@ services:
       # - smtp
     environment:
       - _APP_ENV
+      - _APP_SYSTEM_EMAIL_NAME
+      - _APP_SYSTEM_EMAIL_ADDRESS
       - _APP_REDIS_HOST
       - _APP_REDIS_PORT
       - _APP_SMTP_HOST
@@ -290,6 +298,7 @@ services:
       - MYSQL_USER=user
       - MYSQL_PASSWORD=password
     command: 'mysqld --innodb-flush-method=fsync'
+    # command: mv /var/lib/mysql/ib_logfile1 /var/lib/mysql/ib_logfile1.bu
 
   maildev:
     image: djfarrelly/maildev
@@ -301,14 +310,16 @@ services:
       - appwrite
 
   # smtp:
-  #   image: appwrite/smtp:1.0.1
+  #   image: appwrite/smtp:1.2.0
   #   container_name: appwrite-smtp
   #   restart: unless-stopped
   #   networks:
   #     - appwrite
   #   environment:
-  #     - MAILNAME=appwrite
-  #     - RELAY_NETWORKS=:192.168.0.0/24:10.0.0.0/16
+  #     - LOCAL_DOMAINS=@
+  #     - RELAY_FROM_HOSTS=192.168.0.0/16 ; *.yourdomain.com
+  #     - SMARTHOST_HOST=smtp
+  #     - SMARTHOST_PORT=587
 
   redis:
     image: redis:5.0