diff --git a/app/controllers/api/projects.php b/app/controllers/api/projects.php
index cf64e8bdb3..2cbf4f5271 100644
--- a/app/controllers/api/projects.php
+++ b/app/controllers/api/projects.php
@@ -1786,11 +1786,6 @@ App::get('/v1/projects/:projectId/templates/email/:type/:locale')
     ->param('projectId', '', new UID(), 'Project unique ID.')
     ->param('type', '', new WhiteList(Config::getParam('locale-templates')['sms'] ?? []), 'Template type')
     ->param('locale', '', new Text(6), 'Template locale')
-    ->param('senderName', '', new Text(255), 'Name of the email sender')
-    ->param('senderEmail', '', new Email(), 'Email of the sender')
-    ->param('subject', '', new Text(255), 'Email Subject')
-    ->param('message', '', new Text(0), 'Template message')
-    ->param('replyTo', '', new Email(), 'Reply to email', true)
     ->inject('response')
     ->inject('dbForConsole')
     ->action(function (string $projectId, string $type, string $locale, Response $response, Database $dbForConsole) {
@@ -1808,8 +1803,8 @@ App::get('/v1/projects/:projectId/templates/email/:type/:locale')
             $template = [
                 'message' => Template::fromFile(__DIR__ . '/../../config/locale/templates/email-base.tpl'),
                 'subject' => (new Locale($locale))->getText('emails.' . $type . '.subject'),
-                'senderEmail' => App::getEnv('APP_SYSTEM_EMAIL_ADDRESS', ''),
-                'senderName' => App::getEnv('APP_SYSTEM_NAME', '')
+                'senderEmail' => App::getEnv('_APP_SYSTEM_EMAIL_ADDRESS', ''),
+                'senderName' => App::getEnv('_APP_SYSTEM_EMAIL_NAME', '')
             ];
         }
 
diff --git a/src/Appwrite/Utopia/Response.php b/src/Appwrite/Utopia/Response.php
index eca5854640..8ca8745350 100644
--- a/src/Appwrite/Utopia/Response.php
+++ b/src/Appwrite/Utopia/Response.php
@@ -62,6 +62,7 @@ use Appwrite\Utopia\Response\Model\Platform;
 use Appwrite\Utopia\Response\Model\Project;
 use Appwrite\Utopia\Response\Model\Rule;
 use Appwrite\Utopia\Response\Model\Deployment;
+use Appwrite\Utopia\Response\Model\EmailTemplate;
 use Appwrite\Utopia\Response\Model\Token;
 use Appwrite\Utopia\Response\Model\Webhook;
 use Appwrite\Utopia\Response\Model\Preferences;
@@ -73,6 +74,7 @@ use Appwrite\Utopia\Response\Model\HealthVersion;
 use Appwrite\Utopia\Response\Model\Mock; // Keep last
 use Appwrite\Utopia\Response\Model\Provider;
 use Appwrite\Utopia\Response\Model\Runtime;
+use Appwrite\Utopia\Response\Model\Template;
 use Appwrite\Utopia\Response\Model\UsageBuckets;
 use Appwrite\Utopia\Response\Model\UsageCollection;
 use Appwrite\Utopia\Response\Model\UsageDatabase;
@@ -206,7 +208,7 @@ class Response extends SwooleResponse
     public const MODEL_VARIABLE = 'variable';
     public const MODEL_VARIABLE_LIST = 'variableList';
     public const MODEL_TEMPLATE = 'template';
-    public const MODEL_EMAIL_TEMPLATE = 'email_template';
+    public const MODEL_EMAIL_TEMPLATE = 'emailTemplate';
 
     // Health
     public const MODEL_HEALTH_STATUS = 'healthStatus';
@@ -343,6 +345,8 @@ class Response extends SwooleResponse
             ->setModel(new UsageFunctions())
             ->setModel(new UsageFunction())
             ->setModel(new UsageProject())
+            ->setModel(new Template())
+            ->setModel(new EmailTemplate())
             // Verification
             // Recovery
             // Tests (keep last)
diff --git a/src/Appwrite/Utopia/Response/Model/EmailTemplate.php b/src/Appwrite/Utopia/Response/Model/EmailTemplate.php
index 07b7d9c4b7..824815f90c 100644
--- a/src/Appwrite/Utopia/Response/Model/EmailTemplate.php
+++ b/src/Appwrite/Utopia/Response/Model/EmailTemplate.php
@@ -44,7 +44,7 @@ class EmailTemplate extends Template
      */
     public function getName(): string
     {
-        return 'Template';
+        return 'EmailTemplate';
     }
 
     /**
@@ -54,6 +54,6 @@ class EmailTemplate extends Template
      */
     public function getType(): string
     {
-        return Response::MODEL_TEMPLATE;
+        return Response::MODEL_EMAIL_TEMPLATE;
     }
 }