diff --git a/.env b/.env
index 5c76d53b..fb60f3b2 100644
--- a/.env
+++ b/.env
@@ -148,3 +148,11 @@ APP_TIMEZONE = 'Asia/Kolkata'
 #--------------------------------------------------------------------
 WAAI_TOKEN = '6568739969f28'
 WAAI_INSTANCE = '656876690A9FD'
+
+#--------------------------------------------------------------------
+# Email Host Name,User,Passcode And Port
+#--------------------------------------------------------------------
+SMTP_Host = 'smtp.sendgrid.net'
+SMTP_User = 'apikey'
+SMTP_Pass = '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'
+SMTP_Port = 587
diff --git a/app/Config/Constants.php b/app/Config/Constants.php
index 306ba1c1..f26c5517 100644
--- a/app/Config/Constants.php
+++ b/app/Config/Constants.php
@@ -126,9 +126,16 @@ define('order_child_column', ["invoice_id","wp_api_line_items_id","customer_id"]
 // define('WAAI_TOKEN', '6568739969f28');
 // define('WAAI_INSTANCE', '656876690A9FD');
 
+## GET Constant Based on ENV file Starts...
 define('WAAI_TOKEN', getenv('WAAI_TOKEN'));
 define('WAAI_INSTANCE', getenv('WAAI_INSTANCE'));
 
+define('SMTP_Host', getenv('SMTP_Host'));
+define('SMTP_User', getenv('SMTP_User'));
+define('SMTP_Pass', getenv('SMTP_Pass'));
+define('SMTP_Port', getenv('SMTP_Port'));
+## GET Constant Based on Env File Ends...
+
 define('SEND_WAAI_URL', 'https://waai.in/api/send');
 define('SEND_WAAI_GROUP_URL', 'https://waai.in/api/send_group');
 define('EXPIRAY_NOTIFY_TEMPLATE_EMAIL','EXPIRAY_NOTIFY_TEMPLATE_EMAIL');
diff --git a/app/Config/Email.php b/app/Config/Email.php
index 5cb4e15a..ad655dff 100644
--- a/app/Config/Email.php
+++ b/app/Config/Email.php
@@ -28,22 +28,22 @@ class Email extends BaseConfig
     /**
      * SMTP Server Address
      */
-    public string $SMTPHost = 'smtp.sendgrid.net';
+    public string $SMTPHost = SMTP_Host;
 
     /**
      * SMTP Username
      */
-    public string $SMTPUser = 'apikey';
+    public string $SMTPUser = SMTP_User;
 
     /**
      * SMTP Password
      */
-    public string $SMTPPass = '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';
+    public string $SMTPPass = SMTP_Pass;
 
     /**
      * SMTP Port
      */
-    public int $SMTPPort = 587;
+    public int $SMTPPort = SMTP_Port;
 
     /**
      * SMTP Timeout (in seconds)