diff --git a/.gitmodules b/.gitmodules
index 33e1bf0f0..09a9253ed 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "app/console"]
 	path = app/console
 	url = https://github.com/appwrite/console
-	branch = 3.1.1
+	branch = feat-usage-1.4
diff --git a/app/controllers/api/account.php b/app/controllers/api/account.php
index ed4cc6c4a..7c7230bbf 100644
--- a/app/controllers/api/account.php
+++ b/app/controllers/api/account.php
@@ -76,7 +76,7 @@ App::post('/v1/account')
     ->inject('project')
     ->inject('dbForProject')
     ->inject('queueForEvents')
-    ->action(function (string $userId, string $email, string $password, string $name, Request $request, Response $response, Document $project, Database $dbForProject, Event $queueForEvents) {
+    ->action(function (string $userId, string $email, string $password, string $name, Request $request, Response $response, Document $user, Document $project, Database $dbForProject, Event $queueForEvents) {
 
         $email = \strtolower($email);
         if ('console' === $project->getId()) {
diff --git a/app/controllers/api/databases.php b/app/controllers/api/databases.php
index 786cabc30..596ea6171 100644
--- a/app/controllers/api/databases.php
+++ b/app/controllers/api/databases.php
@@ -22,6 +22,7 @@ use Utopia\Database\Database;
 use Utopia\Database\DateTime;
 use Utopia\Database\Document;
 use Utopia\Database\Exception\Authorization as AuthorizationException;
+use Utopia\Database\Exception\Conflict;
 use Utopia\Database\Exception\Duplicate as DuplicateException;
 use Utopia\Database\Exception\Limit as LimitException;
 use Utopia\Database\Exception\Restricted as RestrictedException;
@@ -57,13 +58,26 @@ use Utopia\Validator\URL;
 use Utopia\Validator\WhiteList;
 
 /**
- * Create attribute of varying type
- *
+ * * Create attribute of varying type
  *
+ * @param string $databaseId
+ * @param string $collectionId
+ * @param Document $attribute
+ * @param Response $response
+ * @param Database $dbForProject
+ * @param EventDatabase $queueForDatabase
+ * @param Event $queueForEvents
  * @return Document Newly created attribute document
+ * @throws AuthorizationException
  * @throws Exception
+ * @throws LimitException
+ * @throws RestrictedException
+ * @throws StructureException
+ * @throws \Utopia\Database\Exception
+ * @throws Conflict
+ * @throws \Utopia\Exception
  */
-function createAttribute(string $databaseId, string $collectionId, Document $attribute, Response $response, Database $dbForProject, EventDatabase $queueForDatabase, Event $events): Document
+function createAttribute(string $databaseId, string $collectionId, Document $attribute, Response $response, Database $dbForProject, EventDatabase $queueForDatabase, Event $queueForEvents): Document
 {
     $key = $attribute->getAttribute('key');
     $type = $attribute->getAttribute('type', '');
@@ -1529,7 +1543,7 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/dateti
             'default' => $default,
             'array' => $array,
             'filters' => $filters,
-        ]), $response, $dbForProject, $database, $events);
+        ]), $response, $dbForProject, $queueForDatabase, $queueForEvents);
 
         $response
             ->setStatusCode(Response::STATUS_CODE_ACCEPTED)
diff --git a/app/controllers/api/functions.php b/app/controllers/api/functions.php
index 9d598b58b..8fcee7053 100644
--- a/app/controllers/api/functions.php
+++ b/app/controllers/api/functions.php
@@ -285,7 +285,12 @@ App::post('/v1/functions')
 
             /** Trigger Webhook */
             $ruleModel = new Rule();
-            $ruleCreate = new Event(Event::WEBHOOK_QUEUE_NAME, Event::WEBHOOK_CLASS_NAME);
+            $ruleCreate =
+                $queueForEvents
+                     ->setClass(Event::WEBHOOK_CLASS_NAME)
+                     ->setQueue(Event::WEBHOOK_QUEUE_NAME)
+                ;
+
             $ruleCreate
                 ->setProject($project)
                 ->setEvent('rules.[ruleId].create')
@@ -999,7 +1004,9 @@ App::post('/v1/functions/:functionId/deployments')
     ->inject('deviceLocal')
     ->inject('dbForConsole')
     ->inject('queueForBuilds')
-    ->action(function (string $functionId, string $entrypoint, mixed $code, bool $activate, Request $request, Response $response, Database $dbForProject, Event $queueForEvents, Document $project, Device $deviceFunctions, Device $deviceLocal, Database $dbForConsole, Build $queueForBuilds) {
+    ->action(function (string $functionId, string $entrypoint, ?string $commands, mixed $code, bool $activate, Request $request, Response $response, Database $dbForProject, Event $queueForEvents, Document $project, Device $deviceFunctions, Device $deviceLocal, Database $dbForConsole, Build $queueForBuilds) {
+
+        $activate = filter_var($activate, FILTER_VALIDATE_BOOLEAN);
 
         $function = $dbForProject->getDocument('functions', $functionId);
 
diff --git a/app/controllers/api/migrations.php b/app/controllers/api/migrations.php
index 83888fff2..d51c6adbf 100644
--- a/app/controllers/api/migrations.php
+++ b/app/controllers/api/migrations.php
@@ -51,8 +51,9 @@ App::post('/v1/migrations/appwrite')
     ->inject('dbForProject')
     ->inject('project')
     ->inject('user')
-    ->inject('events')
-    ->action(function (array $resources, string $endpoint, string $projectId, string $apiKey, Response $response, Database $dbForProject, Document $project, Document $user, Event $events) {
+    ->inject('queueForEvents')
+    ->inject('queueForMigrations')
+    ->action(function (array $resources, string $endpoint, string $projectId, string $apiKey, Response $response, Database $dbForProject, Document $project, Document $user, Event $queueForEvents, Migration $queueForMigrations) {
         $migration = $dbForProject->createDocument('migrations', new Document([
             '$id' => ID::unique(),
             'status' => 'pending',
@@ -69,11 +70,10 @@ App::post('/v1/migrations/appwrite')
             'errors' => [],
         ]));
 
-        $events->setParam('migrationId', $migration->getId());
+        $queueForEvents->setParam('migrationId', $migration->getId());
 
         // Trigger Transfer
-        $event = new Migration();
-        $event
+        $queueForMigrations
             ->setMigration($migration)
             ->setProject($project)
             ->setUser($user)
@@ -104,9 +104,10 @@ App::post('/v1/migrations/firebase/oauth')
     ->inject('dbForConsole')
     ->inject('project')
     ->inject('user')
-    ->inject('events')
+    ->inject('queueForEvents')
+    ->inject('queueForMigrations')
     ->inject('request')
-    ->action(function (array $resources, string $projectId, Response $response, Database $dbForProject, Database $dbForConsole, Document $project, Document $user, Event $events, Request $request) {
+    ->action(function (array $resources, string $projectId, Response $response, Database $dbForProject, Database $dbForConsole, Document $project, Document $user, Event $queueForEvents, Migration $queueForMigrations, Request $request) {
         $firebase = new OAuth2Firebase(
             App::getEnv('_APP_MIGRATIONS_FIREBASE_CLIENT_ID', ''),
             App::getEnv('_APP_MIGRATIONS_FIREBASE_CLIENT_SECRET', ''),
@@ -171,11 +172,10 @@ App::post('/v1/migrations/firebase/oauth')
             'errors' => []
         ]));
 
-        $events->setParam('migrationId', $migration->getId());
+        $queueForEvents->setParam('migrationId', $migration->getId());
 
         // Trigger Transfer
-        $event = new Migration();
-        $event
+        $queueForMigrations
             ->setMigration($migration)
             ->setProject($project)
             ->setUser($user)
@@ -205,8 +205,9 @@ App::post('/v1/migrations/firebase')
     ->inject('dbForProject')
     ->inject('project')
     ->inject('user')
-    ->inject('events')
-    ->action(function (array $resources, string $serviceAccount, Response $response, Database $dbForProject, Document $project, Document $user, Event $events) {
+    ->inject('queueForEvents')
+    ->inject('queueForMigrations')
+    ->action(function (array $resources, string $serviceAccount, Response $response, Database $dbForProject, Document $project, Document $user, Event $queueForEvents, Migration $queueForMigrations) {
         $migration = $dbForProject->createDocument('migrations', new Document([
             '$id' => ID::unique(),
             'status' => 'pending',
@@ -221,11 +222,10 @@ App::post('/v1/migrations/firebase')
             'errors' => [],
         ]));
 
-        $events->setParam('migrationId', $migration->getId());
+        $queueForEvents->setParam('migrationId', $migration->getId());
 
         // Trigger Transfer
-        $event = new Migration();
-        $event
+        $queueForMigrations
             ->setMigration($migration)
             ->setProject($project)
             ->setUser($user)
@@ -260,8 +260,9 @@ App::post('/v1/migrations/supabase')
     ->inject('dbForProject')
     ->inject('project')
     ->inject('user')
-    ->inject('events')
-    ->action(function (array $resources, string $endpoint, string $apiKey, string $databaseHost, string $username, string $password, int $port, Response $response, Database $dbForProject, Document $project, Document $user, Event $events) {
+    ->inject('queueForEvents')
+    ->inject('queueForMigrations')
+    ->action(function (array $resources, string $endpoint, string $apiKey, string $databaseHost, string $username, string $password, int $port, Response $response, Database $dbForProject, Document $project, Document $user, Event $queueForEvents, Migration $queueForMigrations) {
         $migration = $dbForProject->createDocument('migrations', new Document([
             '$id' => ID::unique(),
             'status' => 'pending',
@@ -281,11 +282,10 @@ App::post('/v1/migrations/supabase')
             'errors' => [],
         ]));
 
-        $events->setParam('migrationId', $migration->getId());
+        $queueForEvents->setParam('migrationId', $migration->getId());
 
         // Trigger Transfer
-        $event = new Migration();
-        $event
+        $queueForMigrations
             ->setMigration($migration)
             ->setProject($project)
             ->setUser($user)
@@ -321,8 +321,9 @@ App::post('/v1/migrations/nhost')
     ->inject('dbForProject')
     ->inject('project')
     ->inject('user')
-    ->inject('events')
-    ->action(function (array $resources, string $subdomain, string $region, string $adminSecret, string $database, string $username, string $password, int $port, Response $response, Database $dbForProject, Document $project, Document $user, Event $events) {
+    ->inject('queueForEvents')
+    ->inject('queueForMigrations')
+    ->action(function (array $resources, string $subdomain, string $region, string $adminSecret, string $database, string $username, string $password, int $port, Response $response, Database $dbForProject, Document $project, Document $user, Event $queueForEvents, Migration $queueForMigrations) {
         $migration = $dbForProject->createDocument('migrations', new Document([
             '$id' => ID::unique(),
             'status' => 'pending',
@@ -343,11 +344,10 @@ App::post('/v1/migrations/nhost')
             'errors' => [],
         ]));
 
-        $events->setParam('migrationId', $migration->getId());
+        $queueForEvents->setParam('migrationId', $migration->getId());
 
         // Trigger Transfer
-        $event = new Migration();
-        $event
+        $queueForMigrations
             ->setMigration($migration)
             ->setProject($project)
             ->setUser($user)
@@ -931,8 +931,8 @@ App::patch('/v1/migrations/:migrationId')
     ->inject('dbForProject')
     ->inject('project')
     ->inject('user')
-    ->inject('events')
-    ->action(function (string $migrationId, Response $response, Database $dbForProject, Document $project, Document $user, Event $eventInstance) {
+    ->inject('queueForMigrations')
+    ->action(function (string $migrationId, Response $response, Database $dbForProject, Document $project, Document $user, Migration $queueForMigrations) {
         $migration = $dbForProject->getDocument('migrations', $migrationId);
 
         if ($migration->isEmpty()) {
@@ -948,8 +948,7 @@ App::patch('/v1/migrations/:migrationId')
             ->setAttribute('dateUpdated', \time());
 
         // Trigger Migration
-        $event = new Migration();
-        $event
+        $queueForMigrations
             ->setMigration($migration)
             ->setProject($project)
             ->setUser($user)
@@ -974,8 +973,8 @@ App::delete('/v1/migrations/:migrationId')
     ->param('migrationId', '', new UID(), 'Migration ID.')
     ->inject('response')
     ->inject('dbForProject')
-    ->inject('events')
-    ->action(function (string $migrationId, Response $response, Database $dbForProject, Event $events) {
+    ->inject('queueForEvents')
+    ->action(function (string $migrationId, Response $response, Database $dbForProject, Event $queueForEvents) {
         $migration = $dbForProject->getDocument('migrations', $migrationId);
 
         if ($migration->isEmpty()) {
@@ -986,7 +985,7 @@ App::delete('/v1/migrations/:migrationId')
             throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Failed to remove migration from DB');
         }
 
-        $events->setParam('migrationId', $migration->getId());
+        $queueForEvents->setParam('migrationId', $migration->getId());
 
         $response->noContent();
     });
diff --git a/app/controllers/api/teams.php b/app/controllers/api/teams.php
index 2fec0c24f..f52121743 100644
--- a/app/controllers/api/teams.php
+++ b/app/controllers/api/teams.php
@@ -388,7 +388,9 @@ App::post('/v1/teams/:teamId/memberships')
     ->inject('queueForMails')
     ->inject('queueForMessaging')
     ->inject('queueForEvents')
-    ->action(function (string $teamId, string $email, array $roles, string $url, string $name, Response $response, Document $project, Document $user, Database $dbForProject, Locale $locale, Mail $queueForMails, EventPhone $queueForMessaging, Event $queueForEvents) {
+    ->action(function (string $teamId, string $email, string $userId, string $phone, array $roles, string $url, string $name, Response $response, Document $project, Document $user, Database $dbForProject, Locale $locale, Mail $queueForMails, EventPhone $queueForMessaging, Event $queueForEvents) {
+        $isAPIKey = Auth::isAppUser(Authorization::getRoles());
+        $isPrivilegedUser = Auth::isPrivilegedUser(Authorization::getRoles());
 
         if (empty($url)) {
             if (!$isAPIKey && !$isPrivilegedUser) {
@@ -574,7 +576,7 @@ App::post('/v1/teams/:teamId/memberships')
                         $replyTo = $smtp['replyTo'];
                     }
 
-                    $mails
+                    $queueForMails
                         ->setSmtpHost($smtp['host'] ?? '')
                         ->setSmtpPort($smtp['port'] ?? '')
                         ->setSmtpUsername($smtp['username'] ?? '')
@@ -1094,7 +1096,6 @@ App::get('/v1/teams/:teamId/logs')
         $audit = new Audit($dbForProject);
         $resource = 'team/' . $team->getId();
         $logs = $audit->getLogsByResource($resource, $limit, $offset);
-
         $output = [];
 
         foreach ($logs as $i => &$log) {
diff --git a/app/controllers/shared/api.php b/app/controllers/shared/api.php
index 57319a698..4afadedbd 100644
--- a/app/controllers/shared/api.php
+++ b/app/controllers/shared/api.php
@@ -249,8 +249,8 @@ App::init()
         $queueForDatabase->setProject($project);
 
         $dbForProject
-            ->on(Database::EVENT_DOCUMENT_CREATE, fn ($event, $document) => $databaseListener($event, $document, $project, $queueForUsage, $dbForProject))
-            ->on(Database::EVENT_DOCUMENT_DELETE, fn ($event, $document) => $databaseListener($event, $document, $project, $queueForUsage, $dbForProject))
+            ->on(Database::EVENT_DOCUMENT_CREATE, 'calculate-usage', fn ($event, $document) => $databaseListener($event, $document, $project, $queueForUsage, $dbForProject))
+            ->on(Database::EVENT_DOCUMENT_DELETE, 'calculate-usage', fn ($event, $document) => $databaseListener($event, $document, $project, $queueForUsage, $dbForProject))
         ;
 
         $useCache = $route->getLabel('cache', false);
@@ -427,7 +427,6 @@ App::shutdown()
         $responsePayload = $response->getPayload();
 
         if (!empty($queueForEvents->getEvent())) {
-
             if (empty($queueForEvents->getPayload())) {
                 $queueForEvents->setPayload($responsePayload);
             }
@@ -497,7 +496,7 @@ App::shutdown()
         }
 
         if (!$user->isEmpty()) {
-            $audits->setUser($user);
+            $queueForAudits->setUser($user);
         }
 
         if (!empty($queueForAudits->getResource()) && !empty($queueForAudits->getUser()->getId())) {
diff --git a/app/init.php b/app/init.php
index c156d0036..f22fe089a 100644
--- a/app/init.php
+++ b/app/init.php
@@ -18,6 +18,7 @@ ini_set('display_startup_errors', 1);
 ini_set('default_socket_timeout', -1);
 error_reporting(E_ALL);
 
+use Appwrite\Event\Migration;
 use Appwrite\Event\Usage;
 use Appwrite\Extend\Exception;
 use Appwrite\Auth\Auth;
@@ -53,6 +54,7 @@ use Utopia\Messaging\Adapters\SMS\Telesign;
 use Utopia\Messaging\Adapters\SMS\TextMagic;
 use Utopia\Messaging\Adapters\SMS\Twilio;
 use Utopia\Messaging\Adapters\SMS\Vonage;
+use Utopia\Queue\Server;
 use Utopia\Registry\Registry;
 use Utopia\Storage\Device;
 use Utopia\Storage\Device\Backblaze;
@@ -896,7 +898,9 @@ App::setResource('queueForUsage', function (Connection $queue) {
 App::setResource('queueForCertificates', function (Connection $queue) {
     return new Certificate($queue);
 }, ['queue']);
-
+App::setResource('queueForMigrations', function (Connection $queue) {
+    return new Migration($queue);
+}, ['queue']);
 App::setResource('clients', function ($request, $console, $project) {
     $console->setAttribute('platforms', [ // Always allow current host
         '$collection' => ID::custom('platforms'),
diff --git a/app/worker.php b/app/worker.php
index ed499eca9..be4fd2c66 100644
--- a/app/worker.php
+++ b/app/worker.php
@@ -10,6 +10,7 @@ use Appwrite\Event\Database as EventDatabase;
 use Appwrite\Event\Delete;
 use Appwrite\Event\Func;
 use Appwrite\Event\Mail;
+use Appwrite\Event\Migration;
 use Appwrite\Event\Phone;
 use Appwrite\Event\Usage;
 use Appwrite\Platform\Appwrite;
@@ -76,7 +77,7 @@ Server::setResource('dbForProject', function (Cache $cache, Registry $register,
 Server::setResource('getProjectDB', function (Group $pools, Database $dbForConsole, $cache) {
     $databases = []; // TODO: @Meldiron This should probably be responsibility of utopia-php/pools
 
-    return function (Document $project) use ($pools, $dbForConsole, $cache, &$databases) {
+    return function (Document $project) use ($pools, $dbForConsole, $cache, &$databases): Database {
         if ($project->isEmpty() || $project->getId() === 'console') {
             return $dbForConsole;
         }
@@ -154,6 +155,9 @@ Server::setResource('queueForCertificates', function (Connection $queue) {
 Server::setResource('queueForUsage', function (Connection $queue) {
     return new Usage($queue);
 }, ['queue']);
+Server::setResource('queueForMigrations', function (Connection $queue) {
+    return new Migration($queue);
+}, ['queue']);
 Server::setResource('logger', function (Registry $register) {
     return $register->get('logger');
 }, ['register']);
@@ -169,7 +173,7 @@ Server::setResource('log', fn() => new Log());
  * @param string $projectId of the project
  * @return Device
  */
-Server::setResource('deviceFunctions', function () {
+Server::setResource('getFunctionsDevice', function () {
     return function (string $projectId) {
         return getDevice(APP_STORAGE_FUNCTIONS . '/app-' . $projectId);
     };
@@ -180,7 +184,7 @@ Server::setResource('deviceFunctions', function () {
  * @param string $projectId of the project
  * @return Device
  */
-Server::setResource('deviceFiles', function () {
+Server::setResource('getFilesDevice', function () {
     return function (string $projectId) {
         return getDevice(APP_STORAGE_UPLOADS . '/app-' . $projectId);
     };
@@ -191,7 +195,7 @@ Server::setResource('deviceFiles', function () {
  * @param string $projectId of the project
  * @return Device
  */
-Server::setResource('deviceBuilds', function () {
+Server::setResource('getBuildsDevice', function () {
     return function (string $projectId) {
         return getDevice(APP_STORAGE_BUILDS . '/app-' . $projectId);
     };
@@ -202,7 +206,7 @@ Server::setResource('deviceBuilds', function () {
  * @param string $projectId of the project
  * @return Device
  */
-Server::setResource('deviceCache', function () {
+Server::setResource('getCacheDevice', function () {
     return function (string $projectId) {
         return getDevice(APP_STORAGE_CACHE . '/app-' . $projectId);
     };
@@ -286,4 +290,4 @@ try {
          });
 }
 
-$worker->start();
\ No newline at end of file
+$worker->start();
diff --git a/bin/worker-migrations b/bin/worker-migrations
index 54e57001b..32d4aef46 100644
--- a/bin/worker-migrations
+++ b/bin/worker-migrations
@@ -1,10 +1,3 @@
 #!/bin/sh
 
-if [ -z "$_APP_REDIS_USER" ] && [ -z "$_APP_REDIS_PASS" ]
-then
-    REDIS_BACKEND="${_APP_REDIS_HOST}:${_APP_REDIS_PORT}"
-else
-    REDIS_BACKEND="redis://${_APP_REDIS_USER}:${_APP_REDIS_PASS}@${_APP_REDIS_HOST}:${_APP_REDIS_PORT}"
-fi
-
-INTERVAL=0.1 QUEUE='v1-migrations' APP_INCLUDE='/usr/src/code/app/workers/migrations.php' php /usr/src/code/vendor/bin/resque -dopcache.preload=opcache.preload=/usr/src/code/app/preload.php
\ No newline at end of file
+php /usr/src/code/app/worker.php migrations $@
\ No newline at end of file
diff --git a/src/Appwrite/Event/Migration.php b/src/Appwrite/Event/Migration.php
index 4d53f1679..09fb6a869 100644
--- a/src/Appwrite/Event/Migration.php
+++ b/src/Appwrite/Event/Migration.php
@@ -6,15 +6,21 @@ use DateTime;
 use Resque;
 use ResqueScheduler;
 use Utopia\Database\Document;
+use Utopia\Queue\Client;
+use Utopia\Queue\Connection;
 
 class Migration extends Event
 {
     protected string $type = '';
     protected ?Document $migration = null;
 
-    public function __construct()
+    public function __construct(protected Connection $connection)
     {
-        parent::__construct(Event::MIGRATIONS_QUEUE_NAME, Event::MIGRATIONS_CLASS_NAME);
+        parent::__construct($connection);
+
+        $this
+            ->setQueue(Event::MIGRATIONS_QUEUE_NAME)
+            ->setClass(Event::MIGRATIONS_CLASS_NAME);
     }
 
     /**
@@ -72,7 +78,10 @@ class Migration extends Event
      */
     public function trigger(): string|bool
     {
-        return Resque::enqueue($this->queue, $this->class, [
+
+        $client = new Client($this->queue, $this->connection);
+
+        return $client->enqueue([
             'project' => $this->project,
             'user' => $this->user,
             'migration' => $this->migration
@@ -89,10 +98,11 @@ class Migration extends Event
      */
     public function schedule(DateTime|int $at): void
     {
-        ResqueScheduler::enqueueAt($at, $this->queue, $this->class, [
-            'project' => $this->project,
-            'user' => $this->user,
-            'migration' => $this->migration
-        ]);
+        return;
+//        ResqueScheduler::enqueueAt($at, $this->queue, $this->class, [
+//            'project' => $this->project,
+//            'user' => $this->user,
+//            'migration' => $this->migration
+//        ]);
     }
 }
diff --git a/src/Appwrite/Platform/Services/Workers.php b/src/Appwrite/Platform/Services/Workers.php
index e93b74ce9..6ec841bf2 100644
--- a/src/Appwrite/Platform/Services/Workers.php
+++ b/src/Appwrite/Platform/Services/Workers.php
@@ -14,6 +14,7 @@ use Appwrite\Platform\Workers\Builds;
 use Appwrite\Platform\Workers\Deletes;
 use Appwrite\Platform\Workers\Usage;
 use Appwrite\Platform\Workers\UsageHook;
+use Appwrite\Platform\Workers\Migrations;
 
 class Workers extends Service
 {
@@ -32,6 +33,7 @@ class Workers extends Service
             ->addAction(Deletes::getName(), new Deletes())
             ->addAction(UsageHook::getName(), new UsageHook())
             ->addAction(Usage::getName(), new Usage())
+            ->addAction(Usage::getName(), new Migrations())
 
         ;
     }
diff --git a/src/Appwrite/Platform/Workers/Audits.php b/src/Appwrite/Platform/Workers/Audits.php
index ac6388855..038cad13e 100644
--- a/src/Appwrite/Platform/Workers/Audits.php
+++ b/src/Appwrite/Platform/Workers/Audits.php
@@ -7,6 +7,8 @@ use Throwable;
 use Utopia\Audit\Audit;
 use Utopia\Database\Database;
 use Utopia\Database\Document;
+use Utopia\Database\Exception\Authorization;
+use Utopia\Database\Exception\Structure;
 use Utopia\Platform\Action;
 use Utopia\Queue\Message;
 
@@ -31,8 +33,13 @@ class Audits extends Action
 
 
     /**
-     * @throws Exception
+     * @param Message $message
+     * @param Database $dbForProject
+     * @return void
      * @throws Throwable
+     * @throws \Utopia\Database\Exception
+     * @throws Authorization
+     * @throws Structure
      */
     public function action(Message $message, Database $dbForProject): void
     {
diff --git a/src/Appwrite/Platform/Workers/Builds.php b/src/Appwrite/Platform/Workers/Builds.php
index 84a431f93..ae508f145 100644
--- a/src/Appwrite/Platform/Workers/Builds.php
+++ b/src/Appwrite/Platform/Workers/Builds.php
@@ -18,12 +18,13 @@ use Utopia\Config\Config;
 use Utopia\Database\Database;
 use Utopia\Database\DateTime;
 use Utopia\Database\Document;
+use Utopia\Database\Exception\Conflict;
+use Utopia\Database\Exception\Restricted;
 use Utopia\Database\Validator\Authorization;
 use Utopia\Database\Exception\Structure;
 use Utopia\Database\Helpers\ID;
 use Utopia\Platform\Action;
 use Utopia\Queue\Message;
-use Utopia\Storage\Device;
 use Utopia\Storage\Device\Local;
 use Utopia\Storage\Storage;
 use Utopia\VCS\Adapter\Git\GitHub;
@@ -54,7 +55,17 @@ class Builds extends Action
     }
 
     /**
-     * @throws Exception|\Throwable
+     * @param Message $message
+     * @param Database $dbForConsole
+     * @param Event $queueForEvents
+     * @param Func $queueForFunctions
+     * @param Usage $queueForUsage
+     * @param Cache $cache
+     * @param callable $getProjectDB
+     * @param callable $deviceFunctions
+     * @return void
+     * @throws \Utopia\Database\Exception
+     * @throws Exception
      */
     public function action(Message $message, Database $dbForConsole, Event $queueForEvents, Func $queueForFunctions, Usage $queueForUsage, Cache $cache, callable $getProjectDB, callable $deviceFunctions): void
     {
@@ -84,11 +95,21 @@ class Builds extends Action
     }
 
     /**
-     * @throws Authorization
-     * @throws \Throwable
-     * @throws Structure
+     * @param callable $deviceFunctions
+     * @param Func $queueForFunctions
+     * @param Event $queueForEvents
+     * @param Usage $queueForUsage
+     * @param Database $dbForConsole
+     * @param callable $getProjectDB
+     * @param GitHub $github
+     * @param Document $project
+     * @param Document $function
+     * @param Document $deployment
+     * @param Document $template
+     * @return void
+     * @throws \Utopia\Database\Exception
      */
-    protected function buildDeployment(callable $deviceFunctions, Func $queueForFunctions, Event $queueForEvents, Usage $queueForUsage, Database $dbForConsole, callable $getProjectDB, GitHub $github, Document $project, Document $function, Document $deployment, Document $template)
+    protected function buildDeployment(callable $deviceFunctions, Func $queueForFunctions, Event $queueForEvents, Usage $queueForUsage, Database $dbForConsole, callable $getProjectDB, GitHub $github, Document $project, Document $function, Document $deployment, Document $template): void
     {
         $executor = new Executor(App::getEnv('_APP_EXECUTOR_HOST'));
 
@@ -518,6 +539,24 @@ class Builds extends Action
         }
     }
 
+    /**
+     * @param string $status
+     * @param GitHub $github
+     * @param string $providerCommitHash
+     * @param string $owner
+     * @param string $repositoryName
+     * @param Document $project
+     * @param Document $function
+     * @param string $deploymentId
+     * @param Database $dbForProject
+     * @param Database $dbForConsole
+     * @return void
+     * @throws Structure
+     * @throws \Utopia\Database\Exception
+     * @throws Authorization
+     * @throws Conflict
+     * @throws Restricted
+     */
     protected function runGitAction(string $status, GitHub $github, string $providerCommitHash, string $owner, string $repositoryName, Document $project, Document $function, string $deploymentId, Database $dbForProject, Database $dbForConsole): void
     {
         if ($function->getAttribute('providerSilentMode', false) === true) {
diff --git a/src/Appwrite/Platform/Workers/Certificates.php b/src/Appwrite/Platform/Workers/Certificates.php
index 4c9eb0bba..00b008e72 100644
--- a/src/Appwrite/Platform/Workers/Certificates.php
+++ b/src/Appwrite/Platform/Workers/Certificates.php
@@ -16,6 +16,9 @@ use Utopia\CLI\Console;
 use Utopia\Database\Database;
 use Utopia\Database\DateTime;
 use Utopia\Database\Document;
+use Utopia\Database\Exception\Authorization;
+use Utopia\Database\Exception\Conflict;
+use Utopia\Database\Exception\Structure;
 use Utopia\Database\Helpers\ID;
 use Utopia\Database\Query;
 use Utopia\Domains\Domain;
@@ -46,7 +49,14 @@ class Certificates extends Action
     }
 
     /**
-     * @throws Exception|Throwable
+     * @param Message $message
+     * @param Database $dbForConsole
+     * @param Mail $queueForMails
+     * @param Event $queueForEvents
+     * @param Func $queueForFunctions
+     * @return void
+     * @throws Throwable
+     * @throws \Utopia\Database\Exception
      */
     public function action(Message $message, Database $dbForConsole, Mail $queueForMails, Event $queueForEvents, Func $queueForFunctions): void
     {
@@ -64,7 +74,15 @@ class Certificates extends Action
     }
 
     /**
-     * @throws Exception|Throwable
+     * @param Domain $domain
+     * @param Database $dbForConsole
+     * @param Mail $queueForMails
+     * @param Event $queueForEvents
+     * @param Func $queueForFunctions
+     * @param bool $skipRenewCheck
+     * @return void
+     * @throws Throwable
+     * @throws \Utopia\Database\Exception
      */
     private function execute(Domain $domain, Database $dbForConsole, Mail $queueForMails, Event $queueForEvents, Func $queueForFunctions, bool $skipRenewCheck = false): void
     {
@@ -176,9 +194,15 @@ class Certificates extends Action
      *
      * @param string $domain Domain name that certificate is for
      * @param Document $certificate Certificate document that we need to save
+     * @param bool $success
      * @param Database $dbForConsole Database connection for console
+     * @param Event $queueForEvents
+     * @param Func $queueForFunctions
      * @return void
-     * @throws Exception|Throwable
+     * @throws \Utopia\Database\Exception
+     * @throws Authorization
+     * @throws Conflict
+     * @throws Structure
      */
     private function saveCertificateDocument(string $domain, Document $certificate, bool $success, Database $dbForConsole, Event $queueForEvents, Func $queueForFunctions): void
     {
diff --git a/src/Appwrite/Platform/Workers/Databases.php b/src/Appwrite/Platform/Workers/Databases.php
index 79df4b340..9e9c0126a 100644
--- a/src/Appwrite/Platform/Workers/Databases.php
+++ b/src/Appwrite/Platform/Workers/Databases.php
@@ -39,6 +39,7 @@ class Databases extends Action
      * @param Message $message
      * @param Database $dbForConsole
      * @param Database $dbForProject
+     * @return void
      * @throws Exception
      */
     public function action(Message $message, Database $dbForConsole, Database $dbForProject): void
@@ -79,6 +80,7 @@ class Databases extends Action
      * @param Document $project
      * @param Database $dbForConsole
      * @param Database $dbForProject
+     * @return void
      * @throws Authorization
      * @throws Conflict
      * @throws Exception
@@ -206,6 +208,7 @@ class Databases extends Action
      * @param Document $project
      * @param Database $dbForConsole
      * @param Database $dbForProject
+     * @return void
      * @throws Authorization
      * @throws Conflict
      * @throws Exception
@@ -369,12 +372,13 @@ class Databases extends Action
      * @param Document $project
      * @param Database $dbForConsole
      * @param Database $dbForProject
+     * @return void
      * @throws Authorization
      * @throws Conflict
      * @throws Structure
      * @throws DatabaseException
      */
-    private function createIndex(Document $database, Document $collection, Document $index, Document $project, Database $dbForConsole, Database $dbForProject)
+    private function createIndex(Document $database, Document $collection, Document $index, Document $project, Database $dbForConsole, Database $dbForProject): void
     {
         $projectId = $project->getId();
 
@@ -439,12 +443,13 @@ class Databases extends Action
      * @param Document $project
      * @param Database $dbForConsole
      * @param Database $dbForProject
+     * @return void
      * @throws Authorization
      * @throws Conflict
      * @throws Structure
      * @throws DatabaseException
      */
-    private function deleteIndex(Document $database, Document $collection, Document $index, Document $project, Database $dbForConsole, Database $dbForProject)
+    private function deleteIndex(Document $database, Document $collection, Document $index, Document $project, Database $dbForConsole, Database $dbForProject): void
     {
         $projectId = $project->getId();
 
diff --git a/src/Appwrite/Platform/Workers/Deletes.php b/src/Appwrite/Platform/Workers/Deletes.php
index ce00d9c51..a78e56bed 100644
--- a/src/Appwrite/Platform/Workers/Deletes.php
+++ b/src/Appwrite/Platform/Workers/Deletes.php
@@ -137,7 +137,7 @@ class Deletes extends Action
                 $this->deleteExpiredSessions($dbForConsole, $getProjectDB);
                 break;
             case DELETE_TYPE_USAGE:
-                $this->deleteUsageStats($getProjectDB, $hourlyUsageRetentionDatetime);
+                $this->deleteUsageStats($dbForConsole, $getProjectDB, $hourlyUsageRetentionDatetime);
                 break;
             case DELETE_TYPE_CACHE_BY_RESOURCE:
                 $this->deleteCacheByResource($project, $getProjectDB, $resource);
@@ -195,6 +195,7 @@ class Deletes extends Action
      * @param Document $project
      * @param callable $getProjectDB
      * @param string $resource
+     * @return void
      * @throws Authorization
      */
     protected function deleteCacheByResource(Document $project, callable $getProjectDB, string $resource): void
@@ -266,6 +267,7 @@ class Deletes extends Action
      * @param callable $getProjectDB
      * @param Document $document
      * @param Document $project
+     * @return void
      * @throws Exception
      */
     protected function deleteDatabase(callable $getProjectDB, Document $document, Document $project): void
@@ -285,6 +287,7 @@ class Deletes extends Action
      * @param callable $getProjectDB
      * @param Document $document teams document
      * @param Document $project
+     * @return void
      * @throws Exception
      */
     protected function deleteCollection(callable $getProjectDB, Document $document, Document $project): void
@@ -330,9 +333,10 @@ class Deletes extends Action
      * @param Database $dbForConsole
      * @param callable $getProjectDB
      * @param string $hourlyUsageRetentionDatetime
+     * @return void
      * @throws Exception
      */
-    protected function deleteUsageStats(Database $dbForConsole, callable $getProjectDB, string $hourlyUsageRetentionDatetime)
+    protected function deleteUsageStats(Database $dbForConsole, callable $getProjectDB, string $hourlyUsageRetentionDatetime): void
     {
         $this->deleteForProjectIds($dbForConsole, function (Document $project) use ($getProjectDB, $hourlyUsageRetentionDatetime) {
             $dbForProject = $getProjectDB($project);
@@ -348,6 +352,7 @@ class Deletes extends Action
      * @param callable $getProjectDB
      * @param Document $document teams document
      * @param Document $project
+     * @return void
      * @throws Exception
      */
     protected function deleteMemberships(callable $getProjectDB, Document $document, Document $project): void
@@ -400,8 +405,10 @@ class Deletes extends Action
      * @param callable $getBuildsDevice
      * @param callable $getCacheDevice
      * @param Document $document
-     * @throws Authorization|\Utopia\Database\Exception
+     * @return void
      * @throws Exception
+     * @throws Authorization
+     * @throws \Utopia\Database\Exception
      */
     protected function deleteProject(Database $dbForConsole, callable $getProjectDB, callable $getFilesDevice, callable $getFunctionsDevice, callable $getBuildsDevice, callable $getCacheDevice, Document $document): void
     {
@@ -475,6 +482,8 @@ class Deletes extends Action
     /**
      * @param Database $dbForConsole
      * @param Document $document certificates document
+     * @return void
+     * @throws Exception
      */
     protected function deleteCertificates(Database $dbForConsole, Document $document): void
     {
@@ -522,6 +531,7 @@ class Deletes extends Action
      * @param callable $getProjectDB
      * @param Document $document user document
      * @param Document $project
+     * @return void
      * @throws Exception
      */
     protected function deleteUser(callable $getProjectDB, Document $document, Document $project): void
@@ -570,6 +580,7 @@ class Deletes extends Action
      * @param database $dbForConsole
      * @param callable $getProjectDB
      * @param string $datetime
+     * @return void
      * @throws Exception
      */
     protected function deleteExecutionLogs(database $dbForConsole, callable $getProjectDB, string $datetime): void
@@ -609,6 +620,7 @@ class Deletes extends Action
      * @param Database $dbForConsole
      * @param callable $getProjectDB
      * @param string $datetime
+     * @return void
      * @throws Exception
      */
     protected function deleteRealtimeUsage(Database $dbForConsole, callable $getProjectDB, string $datetime): void
@@ -626,6 +638,7 @@ class Deletes extends Action
      * @param Database $dbForConsole
      * @param callable $getProjectDB
      * @param string $datetime
+     * @return void
      * @throws Exception
      */
     protected function deleteAbuseLogs(Database $dbForConsole, callable $getProjectDB, string $datetime): void
@@ -650,6 +663,7 @@ class Deletes extends Action
      * @param Database $dbForConsole
      * @param callable $getProjectDB
      * @param string $datetime
+     * @return void
      * @throws Exception
      */
     protected function deleteAuditLogs(Database $dbForConsole, callable $getProjectDB, string $datetime): void
@@ -673,6 +687,7 @@ class Deletes extends Action
      * @param callable $getProjectDB
      * @param string $resource
      * @param Document $project
+     * @return void
      * @throws Exception
      */
     protected function deleteAuditLogsByResource(callable $getProjectDB, string $resource, Document $project): void
@@ -688,8 +703,9 @@ class Deletes extends Action
      * @param callable $getProjectDB
      * @param callable $getFunctionsDevice
      * @param callable $getBuildsDevice
-     * @param Document $document
+     * @param Document $document function document
      * @param Document $project
+     * @return void
      * @throws Exception
      */
     protected function deleteFunction(Database $dbForConsole, callable $getProjectDB, callable $getFunctionsDevice, callable $getBuildsDevice, Document $document, Document $project): void
@@ -775,6 +791,7 @@ class Deletes extends Action
      * @param callable $getBuildsDevice
      * @param Document $document
      * @param Document $project
+     * @return void
      * @throws Exception
      */
     protected function deleteDeployment(callable $getProjectDB, callable $getFunctionsDevice, callable $getBuildsDevice, Document $document, Document $project): void
@@ -815,7 +832,7 @@ class Deletes extends Action
          * Request executor to delete all deployment containers
          */
         Console::info("Requesting executor to delete deployment container for deployment " . $deploymentId);
-        $this->deleteRuntimes($document, $project);
+        $this->deleteRuntimes($getProjectDB, $document, $project);
     }
 
 
@@ -825,7 +842,6 @@ class Deletes extends Action
      * @param Database $database to delete it from
      * @param callable|null $callback to perform after document is deleted
      * @return bool
-     * @throws Authorization
      */
     protected function deleteById(Document $document, Database $database, callable $callback = null): bool
     {
@@ -854,9 +870,7 @@ class Deletes extends Action
         $count = 0;
         $chunk = 0;
         $limit = 50;
-        $projects = [];
         $sum = $limit;
-
         $executionStart = \microtime(true);
 
         while ($sum === $limit) {
@@ -883,6 +897,7 @@ class Deletes extends Action
      * @param array $queries
      * @param Database $database
      * @param callable|null $callback
+     * @return void
      * @throws Exception
      */
     protected function deleteByGroup(string $collection, array $queries, Database $database, callable $callback = null): void
@@ -920,6 +935,7 @@ class Deletes extends Action
      * @param Query[] $queries
      * @param Database $database
      * @param callable|null $callback
+     * @return void
      * @throws Exception
      */
     protected function listByGroup(string $collection, array $queries, Database $database, callable $callback = null): void
@@ -957,6 +973,7 @@ class Deletes extends Action
      * @param Database $dbForConsole
      * @param Document $document rule document
      * @param Document $project project document
+     * @return void
      */
     protected function deleteRule(Database $dbForConsole, Document $document, Document $project): void
     {
@@ -1005,8 +1022,9 @@ class Deletes extends Action
      * @param Document $document
      * @param Document $project
      * @return void
+     * @throws Exception
      */
-    protected function deleteInstallation(Database $dbForConsole, callable $getProjectDB, Document $document, Document $project)
+    protected function deleteInstallation(Database $dbForConsole, callable $getProjectDB, Document $document, Document $project): void
     {
         $dbForProject = $getProjectDB($project);
 
@@ -1032,9 +1050,10 @@ class Deletes extends Action
      * @param callable $getProjectDB
      * @param ?Document $function
      * @param Document $project
+     * @return void
      * @throws Exception
      */
-    protected function deleteRuntimes(callable $getProjectDB, ?Document $function, Document $project)
+    protected function deleteRuntimes(callable $getProjectDB, ?Document $function, Document $project): void
     {
         $executor = new Executor(App::getEnv('_APP_EXECUTOR_HOST'));
 
diff --git a/src/Appwrite/Platform/Workers/Functions.php b/src/Appwrite/Platform/Workers/Functions.php
index 695d1c748..328d3e41b 100644
--- a/src/Appwrite/Platform/Workers/Functions.php
+++ b/src/Appwrite/Platform/Workers/Functions.php
@@ -49,7 +49,15 @@ class Functions extends Action
     }
 
     /**
-     * @throws Exception|Throwable
+     * @param Message $message
+     * @param Database $dbForProject
+     * @param Func $queueForFunctions
+     * @param Event $queueForEvents
+     * @param Usage $queueForUsage
+     * @param Log $log
+     * @return void
+     * @throws Exception
+     * @throws Throwable
      */
     public function action(Message $message, Database $dbForProject, Func $queueForFunctions, Event $queueForEvents, Usage $queueForUsage, Log $log): void
     {
@@ -84,7 +92,6 @@ class Functions extends Action
             $limit = 30;
             $sum = 30;
             $offset = 0;
-            $functions = [];
             /** @var Document[] $functions */
             while ($sum >= $limit) {
                 $functions = $dbForProject->find('functions', [
@@ -184,9 +191,28 @@ class Functions extends Action
     }
 
     /**
+     * @param Log $log
+     * @param Database $dbForProject
+     * @param Func $queueForFunctions
+     * @param Usage $queueForUsage
+     * @param Event $queueForEvents
+     * @param Document $project
+     * @param Document $function
+     * @param string $trigger
+     * @param string $path
+     * @param string $method
+     * @param array $headers
+     * @param string|null $data
+     * @param Document|null $user
+     * @param string|null $jwt
+     * @param string|null $event
+     * @param string|null $eventData
+     * @param string|null $executionId
+     * @return void
      * @throws Authorization
-     * @throws Throwable
      * @throws Structure
+     * @throws \Utopia\Database\Exception
+     * @throws \Utopia\Database\Exception\Conflict
      */
     private function execute(
         Log $log,
@@ -209,7 +235,6 @@ class Functions extends Action
     ): void {
             $user ??= new Document();
             $functionId = $function->getId();
-            $functionInternalId = $function->getInternalId();
             $deploymentId = $function->getAttribute('deployment', '');
 
             $log->addTag('functionId', $functionId);
@@ -217,7 +242,6 @@ class Functions extends Action
 
             /** Check if deployment exists */
             $deployment = $dbForProject->getDocument('deployments', $deploymentId);
-            $deploymentInternalId = $deployment->getInternalId();
 
         if ($deployment->getAttribute('resourceId') !== $functionId) {
             throw new Exception('Deployment not found. Create deployment before trying to execute a function');
diff --git a/src/Appwrite/Platform/Workers/Mails.php b/src/Appwrite/Platform/Workers/Mails.php
index d66650f18..9db6594a1 100644
--- a/src/Appwrite/Platform/Workers/Mails.php
+++ b/src/Appwrite/Platform/Workers/Mails.php
@@ -7,10 +7,9 @@ use Exception;
 use PHPMailer\PHPMailer\PHPMailer;
 use Utopia\App;
 use Utopia\CLI\Console;
-use Utopia\Database\Document;
-use Utopia\Locale\Locale;
 use Utopia\Platform\Action;
 use Utopia\Queue\Message;
+use Utopia\Registry\Registry;
 
 class Mails extends Action
 {
@@ -32,10 +31,13 @@ class Mails extends Action
     }
 
     /**
+     * @param Message $message
+     * @param Registry $register
      * @throws \PHPMailer\PHPMailer\Exception
+     * @return void
      * @throws Exception
      */
-    public function action(Message $message, $register): void
+    public function action(Message $message, Registry $register): void
     {
 
         $payload = $message->getPayload() ?? [];
@@ -44,29 +46,30 @@ class Mails extends Action
             throw new Exception('Missing payload');
         }
 
-        if (empty(App::getEnv('_APP_SMTP_HOST'))) {
-            Console::info('Skipped mail processing. No SMTP server hostname has been set.');
+        $smtp = $payload['smtp'];
+
+        if (empty($smtp) && empty(App::getEnv('_APP_SMTP_HOST'))) {
+            Console::info('Skipped mail processing. No SMTP configuration has been set.');
             return;
         }
 
         $recipient = $payload['recipient'];
         $subject = $payload['subject'];
+        $variables = $payload['variables'];
         $name = $payload['name'];
-        $body = $payload['body'];
-        $from = $payload['from'];
+
+        $body = Template::fromFile(__DIR__ . '/../config/locale/templates/email-base.tpl');
+
+        foreach ($variables as $key => $value) {
+            $body->setParam('{{' . $key . '}}', $value);
+        }
+
+        $body = $body->render();
 
         /** @var PHPMailer $mail */
-        $mail = $register->get('smtp');
-
-        // Set project mail
-        /*$register->get('smtp')
-            ->setFrom(
-                App::getEnv('_APP_SYSTEM_EMAIL_ADDRESS', APP_EMAIL_TEAM),
-                ($project->getId() === 'console')
-                    ? \urldecode(App::getEnv('_APP_SYSTEM_EMAIL_NAME', APP_NAME.' Server'))
-                    : \sprintf(Locale::getText('account.emails.team'), $project->getAttribute('name')
-                )
-            );*/
+        $mail = empty($smtp)
+            ? $register->get('smtp')
+            : $this->getMailer($smtp);
 
         $mail->clearAddresses();
         $mail->clearAllRecipients();
@@ -74,8 +77,6 @@ class Mails extends Action
         $mail->clearAttachments();
         $mail->clearBCCs();
         $mail->clearCCs();
-
-        $mail->setFrom(App::getEnv('_APP_SYSTEM_EMAIL_ADDRESS', APP_EMAIL_TEAM), (empty($from) ? \urldecode(App::getEnv('_APP_SYSTEM_EMAIL_NAME', APP_NAME . ' Server')) : $from));
         $mail->addAddress($recipient, $name);
         $mail->Subject = $subject;
         $mail->Body = $body;
@@ -87,4 +88,39 @@ class Mails extends Action
             throw new Exception('Error sending mail: ' . $error->getMessage(), 500);
         }
     }
+
+    /**
+     * @param array $smtp
+     * @return PHPMailer
+     * @throws \PHPMailer\PHPMailer\Exception
+     */
+    protected function getMailer(array $smtp): PHPMailer
+    {
+        $mail = new PHPMailer(true);
+
+        $mail->isSMTP();
+
+        $username = $smtp['username'];
+        $password = $smtp['password'];
+
+        $mail->XMailer = 'Appwrite Mailer';
+        $mail->Host = $smtp['host'];
+        $mail->Port = $smtp['port'];
+        $mail->SMTPAuth = (!empty($username) && !empty($password));
+        $mail->Username = $username;
+        $mail->Password = $password;
+        $mail->SMTPSecure = $smtp['secure'];
+        $mail->SMTPAutoTLS = false;
+        $mail->CharSet = 'UTF-8';
+
+        $mail->setFrom($smtp['senderEmail'], $smtp['senderName']);
+
+        if (!empty($smtp['replyTo'])) {
+            $mail->addReplyTo($smtp['replyTo'], $smtp['senderName']);
+        }
+
+        $mail->isHTML();
+
+        return $mail;
+    }
 }
diff --git a/src/Appwrite/Platform/Workers/Messaging.php b/src/Appwrite/Platform/Workers/Messaging.php
index 323829b13..f38631c19 100644
--- a/src/Appwrite/Platform/Workers/Messaging.php
+++ b/src/Appwrite/Platform/Workers/Messaging.php
@@ -47,6 +47,8 @@ class Messaging extends Action
     }
 
     /**
+     * @param Message $message
+     * @return void
      * @throws Exception
      */
     public function action(Message $message): void
@@ -54,15 +56,18 @@ class Messaging extends Action
         $payload = $message->getPayload() ?? [];
 
         if (empty($payload)) {
-            throw new Exception('Missing payload');
+            Console::error('Payload arg not found');
+            return;
         }
 
         if (empty($payload['recipient'])) {
-            throw new Exception('Missing recipient');
+            Console::error('Recipient arg not found');
+            return;
         }
 
         if (empty($payload['message'])) {
-            throw new Exception('Missing message');
+            Console::error('Message arg not found');
+            return;
         }
 
         $sms =  match ($this->dsn->getHost()) {
@@ -75,15 +80,15 @@ class Messaging extends Action
             default => null
         };
 
-        $from = App::getEnv('_APP_SMS_FROM');
-
         if (empty(App::getEnv('_APP_SMS_PROVIDER'))) {
-            Console::info('Skipped sms processing. No Phone provider has been set.');
+            Console::error('Skipped sms processing. No Phone provider has been set.');
             return;
         }
 
+        $from = App::getEnv('_APP_SMS_FROM');
+
         if (empty($from)) {
-            Console::info('Skipped sms processing. No phone number has been set.');
+            Console::error('Skipped sms processing. No phone number has been set.');
             return;
         }
 
diff --git a/src/Appwrite/Platform/Workers/Migrations.php b/src/Appwrite/Platform/Workers/Migrations.php
new file mode 100644
index 000000000..da63292aa
--- /dev/null
+++ b/src/Appwrite/Platform/Workers/Migrations.php
@@ -0,0 +1,330 @@
+<?php
+
+namespace Appwrite\Platform\Workers;
+
+use Exception;
+use Utopia\Database\Document;
+use Utopia\Database\Exception\Authorization;
+use Utopia\Database\Exception\Conflict;
+use Utopia\Database\Exception\Restricted;
+use Utopia\Database\Exception\Structure;
+use Utopia\Platform\Action;
+use Utopia\Queue\Message;
+use Appwrite\Event\Event;
+use Appwrite\Messaging\Adapter\Realtime;
+use Appwrite\Permission;
+use Appwrite\Role;
+use Utopia\CLI\Console;
+use Utopia\Database\Database;
+use Utopia\Database\Helpers\ID;
+use Utopia\Migration\Destinations\Appwrite as DestinationsAppwrite;
+use Utopia\Migration\Resource;
+use Utopia\Migration\Source;
+use Utopia\Migration\Sources\Appwrite;
+use Utopia\Migration\Sources\Firebase;
+use Utopia\Migration\Sources\NHost;
+use Utopia\Migration\Sources\Supabase;
+use Utopia\Migration\Transfer;
+
+class Migrations extends Action
+{
+    private ?Database $dbForProject = null;
+    private ?Database $dbForConsole = null;
+
+    public static function getName(): string
+    {
+        return 'migrations';
+    }
+
+    /**
+     * @throws Exception
+     */
+    public function __construct()
+    {
+        $this
+            ->desc('Migrations worker')
+            ->inject('message')
+            ->inject('getProjectDB')
+            ->inject('dbForConsole')
+            ->callback(fn(Message $message, callable $getProjectDB, Database $dbForConsole) => $this->action($message, $getProjectDB, $dbForConsole));
+    }
+
+    /**
+     * @param Message $message
+     * @param callable $getProjectDB
+     * @param Database $dbForConsole
+     * @return void
+     * @throws Exception
+     */
+    public function action(Message $message, callable $getProjectDB, Database $dbForConsole): void
+    {
+        $payload = $message->getPayload() ?? [];
+
+        if (empty($payload)) {
+            throw new Exception('Missing payload');
+        }
+
+        $events    = $payload['events'] ?? [];
+        $project   = new Document($payload['project'] ?? []);
+        $migration = new Document($payload['migration'] ?? []);
+
+        if ($project->getId() === 'console') {
+            return;
+        }
+
+        $this->dbForProject = $getProjectDB($project);
+        $this->dbForConsole = $dbForConsole;
+
+        /**
+         * Handle Event execution.
+         */
+        if (! empty($events)) {
+            return;
+        }
+
+        $this->processMigration($project, $migration);
+    }
+
+    /**
+     * @param string $source
+     * @param array $credentials
+     * @return Source
+     * @throws Exception
+     */
+    protected function processSource(string $source, array $credentials): Source
+    {
+        return match ($source) {
+            Firebase::getName() => new Firebase(
+                json_decode($credentials['serviceAccount'], true),
+            ),
+            Supabase::getName() => new Supabase(
+                $credentials['endpoint'],
+                $credentials['apiKey'],
+                $credentials['databaseHost'],
+                'postgres',
+                $credentials['username'],
+                $credentials['password'],
+                $credentials['port'],
+            ),
+            NHost::getName() => new NHost(
+                $credentials['subdomain'],
+                $credentials['region'],
+                $credentials['adminSecret'],
+                $credentials['database'],
+                $credentials['username'],
+                $credentials['password'],
+                $credentials['port'],
+            ),
+            Appwrite::getName() => new Appwrite($credentials['projectId'], str_starts_with($credentials['endpoint'], 'http://localhost/v1') ? 'http://appwrite/v1' : $credentials['endpoint'], $credentials['apiKey']),
+            default => throw new \Exception('Invalid source type'),
+        };
+    }
+
+    /**
+     * @throws Authorization
+     * @throws Structure
+     * @throws Conflict
+     * @throws \Utopia\Database\Exception
+     * @throws Exception
+     */
+    protected function updateMigrationDocument(Document $migration, Document $project): Document
+    {
+        /** Trigger Realtime */
+        $allEvents = Event::generateEvents('migrations.[migrationId].update', [
+            'migrationId' => $migration->getId(),
+        ]);
+
+        $target = Realtime::fromPayload(
+            event: $allEvents[0],
+            payload: $migration,
+            project: $project
+        );
+
+        Realtime::send(
+            projectId: 'console',
+            payload: $migration->getArrayCopy(),
+            events: $allEvents,
+            channels: $target['channels'],
+            roles: $target['roles'],
+        );
+
+        Realtime::send(
+            projectId: $project->getId(),
+            payload: $migration->getArrayCopy(),
+            events: $allEvents,
+            channels: $target['channels'],
+            roles: $target['roles'],
+        );
+
+        return $this->dbForProject->updateDocument('migrations', $migration->getId(), $migration);
+    }
+
+    /**
+     * @param Document $apiKey
+     * @return void
+     * @throws \Utopia\Database\Exception
+     * @throws Authorization
+     * @throws Conflict
+     * @throws Restricted
+     * @throws Structure
+     */
+    protected function removeAPIKey(Document $apiKey): void
+    {
+        $this->dbForConsole->deleteDocument('keys', $apiKey->getId());
+    }
+
+    /**
+     * @param Document $project
+     * @return Document
+     * @throws Authorization
+     * @throws Structure
+     * @throws \Utopia\Database\Exception
+     * @throws Exception
+     */
+    protected function generateAPIKey(Document $project): Document
+    {
+        $generatedSecret = bin2hex(\random_bytes(128));
+
+        $key = new Document([
+            '$id' => ID::unique(),
+            '$permissions' => [
+                Permission::read(Role::any()),
+                Permission::update(Role::any()),
+                Permission::delete(Role::any()),
+            ],
+            'projectInternalId' => $project->getInternalId(),
+            'projectId' => $project->getId(),
+            'name' => 'Transfer API Key',
+            'scopes' => [
+                'users.read',
+                'users.write',
+                'teams.read',
+                'teams.write',
+                'databases.read',
+                'databases.write',
+                'collections.read',
+                'collections.write',
+                'documents.read',
+                'documents.write',
+                'buckets.read',
+                'buckets.write',
+                'files.read',
+                'files.write',
+                'functions.read',
+                'functions.write',
+            ],
+            'expire' => null,
+            'sdks' => [],
+            'accessedAt' => null,
+            'secret' => $generatedSecret,
+        ]);
+
+        $this->dbForConsole->createDocument('keys', $key);
+        $this->dbForConsole->deleteCachedDocument('projects', $project->getId());
+
+        return $key;
+    }
+
+    /**
+     * @param Document $project
+     * @param Document $migration
+     * @return void
+     * @throws Authorization
+     * @throws Conflict
+     * @throws Restricted
+     * @throws Structure
+     * @throws \Utopia\Database\Exception
+     */
+    protected function processMigration(Document $project, Document $migration): void
+    {
+        /**
+         * @var Document $migrationDocument
+         * @var Transfer $transfer
+         */
+        $migrationDocument = null;
+        $transfer = null;
+        $projectDocument = $this->dbForConsole->getDocument('projects', $project->getId());
+        $tempAPIKey = $this->generateAPIKey($projectDocument);
+
+        try {
+            $migrationDocument = $this->dbForProject->getDocument('migrations', $migration->getId());
+            $migrationDocument->setAttribute('stage', 'processing');
+            $migrationDocument->setAttribute('status', 'processing');
+            $this->updateMigrationDocument($migrationDocument, $projectDocument);
+
+            $source = $this->processSource($migrationDocument->getAttribute('source'), $migrationDocument->getAttribute('credentials'));
+
+            $source->report();
+
+            $destination = new DestinationsAppwrite(
+                $projectDocument->getId(),
+                'http://appwrite/v1',
+                $tempAPIKey['secret'],
+            );
+
+            $transfer = new Transfer(
+                $source,
+                $destination
+            );
+
+            /** Start Transfer */
+            $migrationDocument->setAttribute('stage', 'migrating');
+            $this->updateMigrationDocument($migrationDocument, $projectDocument);
+            $transfer->run($migrationDocument->getAttribute('resources'), function () use ($migrationDocument, $transfer, $projectDocument) {
+                $migrationDocument->setAttribute('resourceData', json_encode($transfer->getCache()));
+                $migrationDocument->setAttribute('statusCounters', json_encode($transfer->getStatusCounters()));
+
+                $this->updateMigrationDocument($migrationDocument, $projectDocument);
+            });
+
+            $errors = $transfer->getReport(Resource::STATUS_ERROR);
+
+            if (count($errors) > 0) {
+                $migrationDocument->setAttribute('status', 'failed');
+                $migrationDocument->setAttribute('stage', 'finished');
+
+                $errorMessages = [];
+                foreach ($errors as $error) {
+                    $errorMessages[] = "Failed to transfer resource '{$error['id']}:{$error['resource']}' with message '{$error['message']}'";
+                }
+
+                $migrationDocument->setAttribute('errors', $errorMessages);
+                $this->updateMigrationDocument($migrationDocument, $projectDocument);
+
+                return;
+            }
+
+            $migrationDocument->setAttribute('status', 'completed');
+            $migrationDocument->setAttribute('stage', 'finished');
+        } catch (\Throwable $th) {
+            Console::error($th->getMessage());
+
+            if ($migrationDocument) {
+                Console::error($th->getMessage());
+                Console::error($th->getTraceAsString());
+                $migrationDocument->setAttribute('status', 'failed');
+                $migrationDocument->setAttribute('stage', 'finished');
+                $migrationDocument->setAttribute('errors', [$th->getMessage()]);
+
+                return;
+            }
+
+            if ($transfer) {
+                $errors = $transfer->getReport(Resource::STATUS_ERROR);
+
+                if (count($errors) > 0) {
+                    $migrationDocument->setAttribute('status', 'failed');
+                    $migrationDocument->setAttribute('stage', 'finished');
+                    $migrationDocument->setAttribute('errors', $errors);
+                }
+            }
+        } finally {
+            if ($migrationDocument) {
+                $this->updateMigrationDocument($migrationDocument, $projectDocument);
+            }
+            if ($tempAPIKey) {
+                $this->removeAPIKey($tempAPIKey);
+            }
+        }
+    }
+}
diff --git a/src/Appwrite/Platform/Workers/Usage.php b/src/Appwrite/Platform/Workers/Usage.php
index 5487a1c8b..3afc3c5ae 100644
--- a/src/Appwrite/Platform/Workers/Usage.php
+++ b/src/Appwrite/Platform/Workers/Usage.php
@@ -42,7 +42,11 @@ class Usage extends Action
     }
 
     /**
-     * @throws Exception
+     * @param Message $message
+     * @param $pools
+     * @param $cache
+     * @return void
+     * @throws \Utopia\Database\Exception
      */
     public function action(Message $message, $pools, $cache): void
     {
@@ -81,10 +85,18 @@ class Usage extends Action
     }
 
 
-/**
-* On Documents that tied by relations like functions>deployments>build || documents>collection>database || buckets>files.
-* When we remove a parent document we need to deduct his children aggregation from the project scope.
-*/
+     /**
+     * On Documents that tied by relations like functions>deployments>build || documents>collection>database || buckets>files.
+     * When we remove a parent document we need to deduct his children aggregation from the project scope.
+
+     * @param $database
+     * @param $projectInternalId
+     * @param Document $document
+     * @param array $metrics
+     * @param $pools
+     * @param $cache
+     * @return void
+     */
     private function reduce($database, $projectInternalId, Document $document, array &$metrics, $pools, $cache)
     {
         try {
diff --git a/src/Appwrite/Platform/Workers/UsageHook.php b/src/Appwrite/Platform/Workers/UsageHook.php
index f0bd0ac2c..e5a535d9a 100644
--- a/src/Appwrite/Platform/Workers/UsageHook.php
+++ b/src/Appwrite/Platform/Workers/UsageHook.php
@@ -4,7 +4,6 @@ namespace Appwrite\Platform\Workers;
 
 use Utopia\App;
 use Utopia\Database\Database;
-use Utopia\Database\DateTime;
 use Utopia\Database\Document;
 use Utopia\Database\Exception\Duplicate;
 use Utopia\Platform\Action;
@@ -32,6 +31,12 @@ class UsageHook extends Usage
         ;
     }
 
+    /**
+     * @param $register
+     * @param $cache
+     * @param $pools
+     * @return void
+     */
     public function action($register, $cache, $pools): void
     {
         Timer::tick(30000, function () use ($register, $cache, $pools) {
diff --git a/src/Appwrite/Platform/Workers/Webhooks.php b/src/Appwrite/Platform/Workers/Webhooks.php
index 85a8e1eae..dd7b92bf5 100644
--- a/src/Appwrite/Platform/Workers/Webhooks.php
+++ b/src/Appwrite/Platform/Workers/Webhooks.php
@@ -10,7 +10,7 @@ use Utopia\Queue\Message;
 
 class Webhooks extends Action
 {
-    private $errors = [];
+    private array $errors = [];
 
     public static function getName(): string
     {
@@ -29,6 +29,8 @@ class Webhooks extends Action
     }
 
     /**
+     * @param Message $message
+     * @return void
      * @throws Exception
      */
     public function action(Message $message): void
@@ -50,14 +52,19 @@ class Webhooks extends Action
             }
         }
 
-        if (!empty($errors)) {
-            throw new Exception(\implode(" / \n\n", $errors));
+        if (!empty($this->errors)) {
+            throw new Exception(\implode(" / \n\n", $this->errors));
         }
-
-            $this->errors = [];
     }
 
-
+    /**
+     * @param array $events
+     * @param string $payload
+     * @param Document $webhook
+     * @param Document $user
+     * @param Document $project
+     * @return void
+     */
     private function execute(array $events, string $payload, Document $webhook, Document $user, Document $project): void
     {
 
@@ -67,7 +74,7 @@ class Webhooks extends Action
         $httpUser = $webhook->getAttribute('httpUser');
         $httpPass = $webhook->getAttribute('httpPass');
         $ch = \curl_init($webhook->getAttribute('url'));
-        var_dump($url);
+
         \curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'POST');
         \curl_setopt($ch, CURLOPT_POSTFIELDS, $payload);
         \curl_setopt($ch, CURLOPT_HEADER, 0);