diff --git a/app/controllers/api/teams.php b/app/controllers/api/teams.php
index eb497066f5..e72ea7bc92 100644
--- a/app/controllers/api/teams.php
+++ b/app/controllers/api/teams.php
@@ -1098,7 +1098,7 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId')
             );
 
             // Is the role change being requested by the user on their own membership?
-            $isCurrentUserAnOwner =  $user->getInternalId() === $membership->getAttribute('userInternalId');
+            $isCurrentUserAnOwner =  $user->getSequence() === $membership->getAttribute('userInternalId');
 
             // Prevent role change if there's only one owner left,
             // the requester is that owner, and the new `$roles` no longer include 'owner'
@@ -1354,7 +1354,7 @@ App::delete('/v1/teams/:teamId/memberships/:membershipId')
                 collection: 'memberships',
                 queries: [
                     Query::contains('roles', ['owner']),
-                    Query::equal('teamInternalId', [$team->getInternalId()])
+                    Query::equal('teamInternalId', [$team->getSequence()])
                 ],
                 max: 2
             );
@@ -1362,7 +1362,7 @@ App::delete('/v1/teams/:teamId/memberships/:membershipId')
             // Is the deletion being requested by the user on their own membership and they are also the owner?
             $isSelfOwner =
                 in_array('owner', $membership->getAttribute('roles')) &&
-                $membership->getAttribute('userInternalId') === $user->getInternalId();
+                $membership->getAttribute('userInternalId') === $user->getSequence();
 
             if ($ownersCount === 1 && $isSelfOwner) {
                 /* Prevent removal if the user is the only owner. */
diff --git a/src/Appwrite/Platform/Modules/Functions/Http/Functions/Deployment/Update.php b/src/Appwrite/Platform/Modules/Functions/Http/Functions/Deployment/Update.php
index f91c8b88e1..23e2fc3b91 100644
--- a/src/Appwrite/Platform/Modules/Functions/Http/Functions/Deployment/Update.php
+++ b/src/Appwrite/Platform/Modules/Functions/Http/Functions/Deployment/Update.php
@@ -105,11 +105,11 @@ class Update extends Base
 
         $queries = [
             Query::equal('trigger', ['manual']),
-            Query::equal("type", ["deployment"]),
-            Query::equal("deploymentResourceType", ["function"]),
-            Query::equal("deploymentResourceInternalId", [$function->getSequence()]),
-            Query::equal("deploymentVcsProviderBranch", [""]),
-            Query::equal("projectInternalId", [$project->getInternalId()])
+            Query::equal('type', ['deployment']),
+            Query::equal('deploymentResourceType', ['function']),
+            Query::equal('deploymentResourceInternalId', [$function->getSequence()]),
+            Query::equal('deploymentVcsProviderBranch', ['']),
+            Query::equal('projectInternalId', [$project->getSequence()])
         ];
 
         Authorization::skip(fn () => $dbForPlatform->foreach('rules', function (Document $rule) use ($dbForPlatform, $deployment) {
diff --git a/src/Appwrite/Platform/Modules/Functions/Workers/Builds.php b/src/Appwrite/Platform/Modules/Functions/Workers/Builds.php
index 0cfaf096ab..a1159ffcf3 100644
--- a/src/Appwrite/Platform/Modules/Functions/Workers/Builds.php
+++ b/src/Appwrite/Platform/Modules/Functions/Workers/Builds.php
@@ -1081,13 +1081,12 @@ class Builds extends Action
                         $resource = $dbForProject->updateDocument('functions', $resource->getId(), $resource);
 
                         $queries = [
-                            Query::equal("projectInternalId", [$project->getSequence()]),
-                            Query::equal("type", ["deployment"]),
-                            Query::equal("deploymentResourceInternalId", [$resource->getSequence()]),
+                            Query::equal('projectInternalId', [$project->getSequence()]),
+                            Query::equal('type', ['deployment']),
+                            Query::equal('deploymentResourceInternalId', [$resource->getSequence()]),
                             Query::equal('deploymentResourceType', ['function']),
                             Query::equal('trigger', ['manual']),
                             Query::equal('deploymentVcsProviderBranch', ['']),
-                            Query::equal("projectInternalId", [$project->getInternalId()])
                         ];
 
                         $rulesUpdated = false;
@@ -1107,13 +1106,12 @@ class Builds extends Action
                         $resource->setAttribute('deploymentCreatedAt', $deployment->getCreatedAt());
                         $resource = $dbForProject->updateDocument('sites', $resource->getId(), $resource);
                         $queries = [
-                            Query::equal("projectInternalId", [$project->getSequence()]),
-                            Query::equal("type", ["deployment"]),
-                            Query::equal("deploymentResourceInternalId", [$resource->getSequence()]),
+                            Query::equal('projectInternalId', [$project->getSequence()]),
+                            Query::equal('type', ['deployment']),
+                            Query::equal('deploymentResourceInternalId', [$resource->getSequence()]),
                             Query::equal('deploymentResourceType', ['site']),
                             Query::equal('trigger', ['manual']),
                             Query::equal('deploymentVcsProviderBranch', ['']),
-                            Query::equal("projectInternalId", [$project->getInternalId()])
                         ];
 
                         $dbForPlatform->forEach('rules', function (Document $rule) use ($dbForPlatform, $deployment) {
@@ -1170,7 +1168,7 @@ class Builds extends Action
                     }
 
                     $queries = [
-                        Query::equal('projectInternalId', [$project->getInternalId()]),
+                        Query::equal('projectInternalId', [$project->getSequence()]),
                         Query::equal('type', ['deployment']),
                         Query::equal('deploymentResourceInternalId', [$resource->getSequence()]),
                         Query::equal('deploymentResourceType', ['site']),
diff --git a/src/Appwrite/Platform/Modules/Proxy/Http/Rules/Redirect/Create.php b/src/Appwrite/Platform/Modules/Proxy/Http/Rules/Redirect/Create.php
index a8f966786c..60e8759e5c 100644
--- a/src/Appwrite/Platform/Modules/Proxy/Http/Rules/Redirect/Create.php
+++ b/src/Appwrite/Platform/Modules/Proxy/Http/Rules/Redirect/Create.php
@@ -179,7 +179,7 @@ class Create extends Action
             'redirectStatusCode' => $statusCode,
             'deploymentResourceType' => $resourceType,
             'deploymentResourceId' => $resource->getId(),
-            'deploymentResourceInternalId' => $resource->getInternalId(),
+            'deploymentResourceInternalId' => $resource->getSequence(),
             'certificateId' => '',
             'search' => implode(' ', [$ruleId, $domain->get()]),
             'owner' => $owner,
diff --git a/src/Appwrite/Platform/Modules/Sites/Http/Sites/Deployment/Update.php b/src/Appwrite/Platform/Modules/Sites/Http/Sites/Deployment/Update.php
index e71e23fa59..a45c2a1243 100644
--- a/src/Appwrite/Platform/Modules/Sites/Http/Sites/Deployment/Update.php
+++ b/src/Appwrite/Platform/Modules/Sites/Http/Sites/Deployment/Update.php
@@ -97,11 +97,11 @@ class Update extends Base
 
         $queries = [
             Query::equal('trigger', ['manual']),
-            Query::equal("type", ["deployment"]),
-            Query::equal("deploymentResourceType", ["site"]),
-            Query::equal("deploymentResourceInternalId", [$site->getSequence()]),
-            Query::equal("deploymentVcsProviderBranch", [""]),
-            Query::equal("projectInternalId", [$project->getInternalId()])
+            Query::equal('type', ['deployment']),
+            Query::equal('deploymentResourceType', ['site']),
+            Query::equal('deploymentResourceInternalId', [$site->getSequence()]),
+            Query::equal('deploymentVcsProviderBranch', ['']),
+            Query::equal('projectInternalId', [$project->getSequence()])
         ];
 
         Authorization::skip(fn () => $dbForPlatform->foreach('rules', function (Document $rule) use ($dbForPlatform, $deployment) {
diff --git a/src/Appwrite/Platform/Workers/Audits.php b/src/Appwrite/Platform/Workers/Audits.php
index 7b68d05cd0..9d4bbbc408 100644
--- a/src/Appwrite/Platform/Workers/Audits.php
+++ b/src/Appwrite/Platform/Workers/Audits.php
@@ -132,7 +132,7 @@ class Audits extends Action
         }
 
         try {
-            foreach ($this->logs as $internalId => $projectLogs) {
+            foreach ($this->logs as $sequence => $projectLogs) {
                 $dbForProject = $getProjectDB($projectLogs['project']);
 
                 Console::log('Processing batch with ' . count($projectLogs['logs']) . ' events');
@@ -141,7 +141,7 @@ class Audits extends Action
                 $audit->logBatch($projectLogs['logs']);
                 Console::success('Audit logs processed successfully');
 
-                unset($this->logs[$internalId]);
+                unset($this->logs[$sequence]);
             }
         } catch (Throwable $e) {
             Console::error('Error processing audit logs: ' . $e->getMessage());