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 49a408e64c..a97e3b97e4 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
@@ -12,6 +12,7 @@ use Appwrite\SDK\Deprecated;
 use Appwrite\SDK\Method;
 use Appwrite\SDK\Response as SDKResponse;
 use Appwrite\Utopia\Response as UtopiaResponse;
+use InvalidArgumentException;
 use Utopia\Database\Database;
 use Utopia\Database\Exception\Conflict as ConflictException;
 use Utopia\Database\Exception\Limit as LimitException;
@@ -42,10 +43,10 @@ class Decrement extends Action
             ->setHttpPath('/v1/databases/:databaseId/collections/:collectionId/documents/:documentId/:attribute/decrement')
             ->desc('Decrement document attribute')
             ->groups(['api', 'database'])
-            ->label('event', 'databases.[databaseId].collections.[collectionId].documents.[documentId].decrement')
+            ->label('event', 'databases.[databaseId].collections.[collectionId].documents.[documentId].update')
             ->label('scope', 'documents.write')
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
-            ->label('audits.event', 'documents.decrement')
+            ->label('audits.event', 'documents.update')
             ->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
             ->label('abuse-key', 'ip:{ip},method:{method},url:{url},userId:{userId}')
             ->label('abuse-limit', APP_LIMIT_WRITE_RATE_DEFAULT * 2)
@@ -109,18 +110,31 @@ class Decrement extends Action
             throw new Exception($this->getLimitException(), $this->getSdkNamespace() . ' "' . $attribute . '" has reached the minimum value of ' . $min);
         } catch (TypeException) {
             throw new Exception(Exception::ATTRIBUTE_TYPE_INVALID, $this->getSdkNamespace() . ' "' . $attribute . '" is not a number');
+        } catch (InvalidArgumentException $e) {
+            throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, $e->getMessage());
         }
 
+        $relationships = \array_map(
+            fn ($document) => $document->getAttribute('key'),
+            \array_filter(
+                $collection->getAttribute('attributes', []),
+                fn ($attribute) => $attribute->getAttribute('type') === Database::VAR_RELATIONSHIP
+            )
+        );
+
         $queueForStatsUsage
             ->addMetric(METRIC_DATABASES_OPERATIONS_WRITES, 1)
             ->addMetric(str_replace('{databaseInternalId}', $database->getSequence(), METRIC_DATABASE_ID_OPERATIONS_WRITES), 1);
 
         $queueForEvents
             ->setParam('databaseId', $databaseId)
-            ->setContext('database', $database)
             ->setParam('collectionId', $collectionId)
             ->setParam('tableId', $collectionId)
-            ->setContext($this->getCollectionsEventsContext(), $collection);
+            ->setParam('documentId', $documentId)
+            ->setParam('rowId', $documentId)
+            ->setContext('database', $database)
+            ->setContext($this->getCollectionsEventsContext(), $collection)
+            ->setPayload($response->getPayload(), sensitive: $relationships);
 
         $response->dynamic($document, $this->getResponseModel());
     }
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 5eadc96b9e..e213a347d9 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
@@ -12,6 +12,7 @@ use Appwrite\SDK\Deprecated;
 use Appwrite\SDK\Method;
 use Appwrite\SDK\Response as SDKResponse;
 use Appwrite\Utopia\Response as UtopiaResponse;
+use InvalidArgumentException;
 use Utopia\Database\Database;
 use Utopia\Database\Exception\Conflict as ConflictException;
 use Utopia\Database\Exception\Limit as LimitException;
@@ -42,10 +43,10 @@ class Increment extends Action
             ->setHttpPath('/v1/databases/:databaseId/collections/:collectionId/documents/:documentId/:attribute/increment')
             ->desc('Increment document attribute')
             ->groups(['api', 'database'])
-            ->label('event', 'databases.[databaseId].collections.[collectionId].documents.[documentId].increment')
+            ->label('event', 'databases.[databaseId].collections.[collectionId].documents.[documentId].update')
             ->label('scope', 'documents.write')
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
-            ->label('audits.event', 'documents.increment')
+            ->label('audits.event', 'documents.update')
             ->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
             ->label('abuse-key', 'ip:{ip},method:{method},url:{url},userId:{userId}')
             ->label('abuse-limit', APP_LIMIT_WRITE_RATE_DEFAULT * 2)
@@ -109,18 +110,31 @@ class Increment extends Action
             throw new Exception($this->getLimitException(), $this->getSdkNamespace() . ' "' . $attribute . '" has reached the maximum value of ' . $max);
         } catch (TypeException) {
             throw new Exception(Exception::ATTRIBUTE_TYPE_INVALID, $this->getSdkNamespace() . ' "' . $attribute . '" is not a number');
+        } catch (InvalidArgumentException $e) {
+            throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, $e->getMessage());
         }
 
+        $relationships = \array_map(
+            fn ($document) => $document->getAttribute('key'),
+            \array_filter(
+                $collection->getAttribute('attributes', []),
+                fn ($attribute) => $attribute->getAttribute('type') === Database::VAR_RELATIONSHIP
+            )
+        );
+
         $queueForStatsUsage
             ->addMetric(METRIC_DATABASES_OPERATIONS_WRITES, 1)
             ->addMetric(str_replace('{databaseInternalId}', $database->getSequence(), METRIC_DATABASE_ID_OPERATIONS_WRITES), 1);
 
         $queueForEvents
             ->setParam('databaseId', $databaseId)
-            ->setContext('database', $database)
             ->setParam('collectionId', $collectionId)
             ->setParam('tableId', $collectionId)
-            ->setContext($this->getCollectionsEventsContext(), $collection);
+            ->setParam('documentId', $documentId)
+            ->setParam('rowId', $documentId)
+            ->setContext('database', $database)
+            ->setContext($this->getCollectionsEventsContext(), $collection)
+            ->setPayload($response->getPayload(), sensitive: $relationships);
 
         $response->dynamic($document, $this->getResponseModel());
     }
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Update.php
index 1d06e6d0da..fe08d1ed85 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Update.php
@@ -280,11 +280,11 @@ class Update extends Action
 
         $queueForEvents
             ->setParam('databaseId', $databaseId)
-            ->setContext('database', $database)
             ->setParam('collectionId', $collection->getId())
             ->setParam('tableId', $collection->getId())
             ->setParam('documentId', $document->getId())
             ->setParam('rowId', $document->getId())
+            ->setContext('database', $database)
             ->setContext($this->getCollectionsEventsContext(), $collection)
             ->setPayload($response->getPayload(), sensitive: $relationships);
     }
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Rows/Column/Decrement.php b/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Rows/Column/Decrement.php
index 272510335f..fffd6db0fd 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Rows/Column/Decrement.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Rows/Column/Decrement.php
@@ -32,10 +32,10 @@ class Decrement extends DecrementDocumentAttribute
             ->setHttpPath('/v1/databases/:databaseId/grids/tables/:tableId/rows/:rowId/:column/decrement')
             ->desc('Decrement row column')
             ->groups(['api', 'database'])
-            ->label('event', 'databases.[databaseId].tables.[tableId].rows.[rowId].decrement')
+            ->label('event', 'databases.[databaseId].tables.[tableId].rows.[rowId].update')
             ->label('scope', 'rows.write')
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
-            ->label('audits.event', 'rows.decrement')
+            ->label('audits.event', 'rows.update')
             ->label('audits.resource', 'database/{request.databaseId}/grid/table/{request.tableId}')
             ->label('abuse-key', 'ip:{ip},method:{method},url:{url},userId:{userId}')
             ->label('abuse-limit', APP_LIMIT_WRITE_RATE_DEFAULT * 2)
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Rows/Column/Increment.php b/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Rows/Column/Increment.php
index 2a28418a6e..67cbd81367 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Rows/Column/Increment.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Rows/Column/Increment.php
@@ -32,10 +32,10 @@ class Increment extends IncrementDocumentAttribute
             ->setHttpPath('/v1/databases/:databaseId/grids/tables/:tableId/rows/:rowId/:column/increment')
             ->desc('Increment row column')
             ->groups(['api', 'database'])
-            ->label('event', 'databases.[databaseId].tables.[tableId].rows.[rowId].increment')
+            ->label('event', 'databases.[databaseId].tables.[tableId].rows.[rowId].update')
             ->label('scope', 'rows.write')
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
-            ->label('audits.event', 'rows.increment')
+            ->label('audits.event', 'rows.update')
             ->label('audits.resource', 'database/{request.databaseId}/grid/table/{request.tableId}')
             ->label('abuse-key', 'ip:{ip},method:{method},url:{url},userId:{userId}')
             ->label('abuse-limit', APP_LIMIT_WRITE_RATE_DEFAULT * 2)