diff --git a/app/controllers/shared/api.php b/app/controllers/shared/api.php
index 8467468ed6..83b56f626a 100644
--- a/app/controllers/shared/api.php
+++ b/app/controllers/shared/api.php
@@ -628,7 +628,6 @@ App::init()
         $queueForFunctions->setPlatform($platform);
         $queueForBuilds->setPlatform($platform);
         $queueForMails->setPlatform($platform);
-        $queueForMigrations->setPlatform($platform);
 
         // Clone the queues, to prevent events triggered by the database listener
         // from overwriting the events that are supposed to be triggered in the shutdown hook.
diff --git a/docker-compose.yml b/docker-compose.yml
index d4d38d4924..57007c4efc 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -740,6 +740,7 @@ services:
       - _APP_MIGRATIONS_FIREBASE_CLIENT_ID
       - _APP_MIGRATIONS_FIREBASE_CLIENT_SECRET
       - _APP_DATABASE_SHARED_TABLES
+      - _APP_OPTIONS_FORCE_HTTPS
 
   appwrite-task-maintenance:
     entrypoint: maintenance
diff --git a/src/Appwrite/Event/Database.php b/src/Appwrite/Event/Database.php
index 8e7f6b7625..eac30ac07e 100644
--- a/src/Appwrite/Event/Database.php
+++ b/src/Appwrite/Event/Database.php
@@ -161,7 +161,7 @@ class Database extends Event
         return $this->document;
     }
 
-    public function setProject(Document $project): self
+    public function setProject(Document $project): static
     {
         $database = $project->getAttribute('database');
         if (!empty($database)) {
diff --git a/src/Appwrite/Event/Event.php b/src/Appwrite/Event/Event.php
index f8fb012075..c7bb22f715 100644
--- a/src/Appwrite/Event/Event.php
+++ b/src/Appwrite/Event/Event.php
@@ -92,9 +92,9 @@ class Event
      * Set queue used for this event.
      *
      * @param string $queue
-     * @return Event
+     * @return static
      */
-    public function setQueue(string $queue): self
+    public function setQueue(string $queue): static
     {
         $this->queue = $queue;
 
@@ -114,9 +114,9 @@ class Event
     /**
      * Set event name used for this event.
      * @param string $event
-     * @return Event
+     * @return static
      */
-    public function setEvent(string $event): self
+    public function setEvent(string $event): static
     {
         $this->event = $event;
 
@@ -137,9 +137,9 @@ class Event
      * Set project for this event.
      *
      * @param Document $project
-     * @return self
+     * @return static
      */
-    public function setProject(Document $project): self
+    public function setProject(Document $project): static
     {
         $this->project = $project;
         return $this;
@@ -159,9 +159,9 @@ class Event
      * Set platform for this event.
      *
      * @param array $platform
-     * @return self
+     * @return static
      */
-    public function setPlatform(array $platform): self
+    public function setPlatform(array $platform): static
     {
         $this->platform = $platform;
         return $this;
@@ -181,9 +181,9 @@ class Event
      * Set user for this event.
      *
      * @param Document $user
-     * @return self
+     * @return static
      */
-    public function setUser(Document $user): self
+    public function setUser(Document $user): static
     {
         $this->user = $user;
 
@@ -193,9 +193,9 @@ class Event
     /**
      * Set user ID for this event.
      *
-     * @return self
+     * @return static
      */
-    public function setUserId(string $userId): self
+    public function setUserId(string $userId): static
     {
         $this->userId = $userId;
 
@@ -225,9 +225,9 @@ class Event
      *
      * @param array $payload
      * @param array $sensitive
-     * @return self
+     * @return static
      */
-    public function setPayload(array $payload, array $sensitive = []): self
+    public function setPayload(array $payload, array $sensitive = []): static
     {
         $this->payload = $payload;
 
diff --git a/src/Appwrite/Event/Messaging.php b/src/Appwrite/Event/Messaging.php
index 3ddbac1040..f4c72c7d72 100644
--- a/src/Appwrite/Event/Messaging.php
+++ b/src/Appwrite/Event/Messaging.php
@@ -161,19 +161,6 @@ class Messaging extends Event
         return $this->scheduledAt;
     }
 
-    /**
-     * Set project for this event.
-     *
-     * @param Document $project
-     * @return self
-     */
-    public function setProject(Document $project): self
-    {
-        $this->project = $project;
-
-        return $this;
-    }
-
     /**
      * Prepare the payload for the event
      *
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Attribute/Decrement.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Attribute/Decrement.php
index 38e7f8f231..a3a1ea6ce8 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Attribute/Decrement.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Attribute/Decrement.php
@@ -177,6 +177,7 @@ class Decrement extends Action
                 value: $value,
                 min: $min
             );
+            $document->setAttribute('$' . $this->getCollectionsEventsContext() . 'Id', $collectionId);
         } catch (ConflictException) {
             throw new Exception($this->getConflictException());
         } catch (NotFoundException) {
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Attribute/Increment.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Attribute/Increment.php
index 10dadae824..157c5ef2af 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Attribute/Increment.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Attribute/Increment.php
@@ -177,6 +177,7 @@ class Increment extends Action
                 value: $value,
                 max: $max
             );
+            $document->setAttribute('$' . $this->getCollectionsEventsContext() . 'Id', $collectionId);
         } catch (ConflictException) {
             throw new Exception($this->getConflictException());
         } catch (NotFoundException) {
diff --git a/src/Appwrite/Platform/Workers/Messaging.php b/src/Appwrite/Platform/Workers/Messaging.php
index 64224a9770..ae94c7580d 100644
--- a/src/Appwrite/Platform/Workers/Messaging.php
+++ b/src/Appwrite/Platform/Workers/Messaging.php
@@ -62,9 +62,6 @@ class Messaging extends Action
      */
     public function __construct()
     {
-
-        $this->adapter = $this->createInternalSMSAdapter();
-
         $this
             ->desc('Messaging worker')
             ->inject('message')
@@ -390,6 +387,10 @@ class Messaging extends Action
 
     private function sendInternalSMSMessage(Document $message, Document $project, array $recipients, Log $log): void
     {
+        if ($this->adapter === null) {
+            $this->adapter = $this->createInternalSMSAdapter();
+        }
+
         if ($this->adapter === null) {
             Console::warning('Skipped SMS processing. SMS adapter is not set.');
             return;
diff --git a/src/Appwrite/Platform/Workers/Migrations.php b/src/Appwrite/Platform/Workers/Migrations.php
index a10ddc4904..69c78d9620 100644
--- a/src/Appwrite/Platform/Workers/Migrations.php
+++ b/src/Appwrite/Platform/Workers/Migrations.php
@@ -52,8 +52,6 @@ class Migrations extends Action
 
     protected array $plan;
 
-    protected array $platform;
-
     /**
      * @var array<string, int>
      */
@@ -108,7 +106,6 @@ class Migrations extends Action
         $this->deviceForMigrations = $deviceForMigrations;
         $this->deviceForFiles = $deviceForFiles;
         $this->plan = $plan;
-        $this->platform = $payload['platform'] ?? [];
 
         if (empty($payload)) {
             throw new Exception('Missing payload');
@@ -144,10 +141,15 @@ class Migrations extends Action
         $credentials = $migration->getAttribute('credentials');
         $migrationOptions = $migration->getAttribute('options');
         $dataSource = Appwrite::SOURCE_API;
-        $endpoint = $this->platform['endpoint'] ?: ($credentials['endpoint'] ?? 'http://appwrite.test/v1');
         $database = null;
         $queries = [];
 
+        if ($credentials['endpoint'] === 'http://localhost/v1') {
+            $platform = Config::getParam('platform', []);
+            $protocol = System::getEnv('_APP_OPTIONS_FORCE_HTTPS') === 'disabled' ? 'http' : 'https';
+            $credentials['endpoint'] = $protocol . '://' . $platform['apiHostname'] . '/v1';
+        }
+
         if ($source === Appwrite::getName() && $destination === DestinationCSV::getName()) {
             $dataSource = Appwrite::SOURCE_DATABASE;
             $database = $this->dbForProject;
@@ -178,7 +180,7 @@ class Migrations extends Action
             ),
             SourceAppwrite::getName() => new SourceAppwrite(
                 $credentials['projectId'],
-                $endpoint,
+                $credentials['endpoint'],
                 $credentials['apiKey'],
                 $dataSource,
                 $database,
@@ -206,10 +208,13 @@ class Migrations extends Action
         $destination = $migration->getAttribute('destination');
         $options = $migration->getAttribute('options', []);
 
+        $protocol = System::getEnv('_APP_OPTIONS_FORCE_HTTPS') === 'disabled' ? 'http' : 'https';
+        $platform = Config::getParam('platform', []);
+
         return match ($destination) {
             DestinationAppwrite::getName() => new DestinationAppwrite(
                 $this->project->getId(),
-                $this->platform['endpoint'],
+                $protocol . '://' . $platform['apiHostname'] . '/v1',
                 $apiKey,
                 $this->dbForProject,
                 Config::getParam('collections', [])['databases']['collections'],
@@ -306,6 +311,8 @@ class Migrations extends Action
 
         $transfer = $source = $destination = null;
 
+
+
         try {
             if (
                 $migration->getAttribute('source') === SourceAppwrite::getName() &&
@@ -313,8 +320,13 @@ class Migrations extends Action
             ) {
                 $credentials = $migration->getAttribute('credentials', []);
                 $credentials['projectId'] = $credentials['projectId'] ?? $project->getId();
-                $credentials['endpoint'] = $credentials['endpoint'] ?? $this->platform['endpoint'];
                 $credentials['apiKey'] = $credentials['apiKey'] ?? $tempAPIKey;
+
+                if (empty($credentials['endpoint'])) {
+                    $platform = Config::getParam('platform', []);
+                    $protocol = System::getEnv('_APP_OPTIONS_FORCE_HTTPS') === 'disabled' ? 'http' : 'https';
+                    $credentials['endpoint'] = $protocol . '://' . $platform['apiHostname'] . '/v1';
+                }
                 $migration->setAttribute('credentials', $credentials);
             }
 
diff --git a/tests/e2e/Services/Databases/Legacy/DatabasesBase.php b/tests/e2e/Services/Databases/Legacy/DatabasesBase.php
index d43d183e5a..d1d2c9687d 100644
--- a/tests/e2e/Services/Databases/Legacy/DatabasesBase.php
+++ b/tests/e2e/Services/Databases/Legacy/DatabasesBase.php
@@ -6118,6 +6118,7 @@ trait DatabasesBase
         ]));
         $this->assertEquals(200, $inc['headers']['status-code']);
         $this->assertEquals(6, $inc['body']['count']);
+        $this->assertEquals($collectionId, $inc['body']['$collectionId']);
 
         // Verify count = 6
         $get = $this->client->call(Client::METHOD_GET, "/databases/$databaseId/collections/$collectionId/documents/$docId", array_merge([
@@ -6229,6 +6230,7 @@ trait DatabasesBase
         ]));
         $this->assertEquals(200, $dec['headers']['status-code']);
         $this->assertEquals(9, $dec['body']['count']);
+        $this->assertEquals($collectionId, $dec['body']['$collectionId']);
 
         $get = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/collections/' . $collectionId . '/documents/' . $documentId, array_merge([
             'content-type' => 'application/json',
diff --git a/tests/e2e/Services/Databases/TablesDB/DatabasesBase.php b/tests/e2e/Services/Databases/TablesDB/DatabasesBase.php
index e74431c779..ba111e5923 100644
--- a/tests/e2e/Services/Databases/TablesDB/DatabasesBase.php
+++ b/tests/e2e/Services/Databases/TablesDB/DatabasesBase.php
@@ -7760,6 +7760,7 @@ trait DatabasesBase
             'x-appwrite-project' => $this->getProject()['$id'],
         ]));
         $this->assertEquals(200, $inc['headers']['status-code']);
+        $this->assertEquals($tableId, $inc['body']['$tableId']);
         $this->assertEquals(6, $inc['body']['count']);
 
         // Verify count = 6
@@ -7872,6 +7873,7 @@ trait DatabasesBase
         ]));
         $this->assertEquals(200, $dec['headers']['status-code']);
         $this->assertEquals(9, $dec['body']['count']);
+        $this->assertEquals($tableId, $dec['body']['$tableId']);
 
         $get = $this->client->call(Client::METHOD_GET, '/tablesdb/' . $databaseId . '/tables/' . $tableId . '/rows/' . $rowId, array_merge([
             'content-type' => 'application/json',