diff --git a/.env b/.env
index 6583a94fc8..1c7e34b766 100644
--- a/.env
+++ b/.env
@@ -1,8 +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_SYSTEM_EMAIL_NAME=self
+_APP_SYSTEM_EMAIL_ADDRESS=self@omparikh.me
+_APP_SYSTEM_SECURITY_EMAIL_ADDRESS=self@omparikh.me
 _APP_OPTIONS_ABUSE=disabled
 _APP_OPTIONS_FORCE_HTTPS=disabled
 _APP_OPENSSL_KEY_V1=your-secret-key
@@ -19,8 +19,11 @@ _APP_INFLUXDB_HOST=influxdb
 _APP_INFLUXDB_PORT=8086
 _APP_STATSD_HOST=telegraf
 _APP_STATSD_PORT=8125
-_APP_SMTP_HOST=maildev
-_APP_SMTP_PORT=25
+_APP_SMTP_HOST=smtp.sendgrid.net
+_APP_SMTP_PORT=465
+_APP_SMTP_SECURE=ssl
+_APP_SMTP_USERNAME=<YOUR_USER_NAME>
+_APP_SMTP_PASSWORD=<YOUR_API_KEY>
 _APP_STORAGE_LIMIT=100000000
 _APP_FUNCTIONS_TIMEOUT=900
-_APP_FUNCTIONS_CONTAINERS=10
\ No newline at end of file
+_APP_FUNCTIONS_CONTAINERS=10
diff --git a/docker-compose.yml b/docker-compose.yml
index ad27815eb6..e595a6c373 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -266,6 +266,9 @@ services:
       - _APP_REDIS_PORT
       - _APP_SMTP_HOST
       - _APP_SMTP_PORT
+      - _APP_SMTP_SECURE
+      - _APP_SMTP_USERNAME
+      - _APP_SMTP_PASSWORD
 
   appwrite-schedule:
     entrypoint: schedule
@@ -293,7 +296,7 @@ services:
     ports:
       - "3306:3306"
     environment:
-      - MYSQL_ROOT_PASSWORD=rootsecretpassword
+      - MYSQL_ROOT_PASSWORD=password
       - MYSQL_DATABASE=${_APP_DB_SCHEMA}
       - MYSQL_USER=${_APP_DB_USER}
       - MYSQL_PASSWORD=${_APP_DB_PASS}