diff --git a/app/config/collections/platform.php b/app/config/collections/platform.php
index a5fedb6461..8a46bfd3ec 100644
--- a/app/config/collections/platform.php
+++ b/app/config/collections/platform.php
@@ -1185,6 +1185,39 @@ return [
                 'default' => false,
                 'array' => false,
             ],
+            [
+                '$id' => ID::custom('personalAccessToken'),
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => 256,
+                'signed' => true,
+                'required' => false,
+                'default' => null,
+                'array' => false,
+                'filters' => ['encrypt'],
+            ],
+            [
+                '$id' => ID::custom('personalAccessTokenExpiry'),
+                'type' => Database::VAR_DATETIME,
+                'format' => '',
+                'size' => 0,
+                'signed' => false,
+                'required' => false,
+                'default' => null,
+                'array' => false,
+                'filters' => ['datetime'],
+            ],
+            [
+                '$id' => ID::custom('personalRefreshToken'),
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => 256,
+                'signed' => true,
+                'required' => false,
+                'default' => null,
+                'array' => false,
+                'filters' => ['encrypt'],
+            ],
         ],
         'indexes' => [
 
diff --git a/src/Appwrite/Migration/Migration.php b/src/Appwrite/Migration/Migration.php
index 19f69b1a4f..56016f1057 100644
--- a/src/Appwrite/Migration/Migration.php
+++ b/src/Appwrite/Migration/Migration.php
@@ -92,6 +92,7 @@ abstract class Migration
         '1.5.11' => 'V20',
         '1.6.0' => 'V21',
         '1.6.1' => 'V21',
+        '1.6.2' => 'V22',
     ];
 
     /**
diff --git a/src/Appwrite/Migration/Version/V22.php b/src/Appwrite/Migration/Version/V22.php
new file mode 100644
index 0000000000..4d15662112
--- /dev/null
+++ b/src/Appwrite/Migration/Version/V22.php
@@ -0,0 +1,83 @@
+<?php
+
+namespace Appwrite\Migration\Version;
+
+use Appwrite\Migration\Migration;
+use Exception;
+use Throwable;
+use Utopia\CLI\Console;
+use Utopia\Database\Database;
+
+class V22 extends Migration
+{
+    /**
+     * @throws Throwable
+     */
+    public function execute(): void
+    {
+        /**
+        * Disable SubQueries for Performance.
+        */
+        foreach (['subQueryIndexes', 'subQueryPlatforms', 'subQueryDomains', 'subQueryKeys', 'subQueryWebhooks', 'subQuerySessions', 'subQueryTokens', 'subQueryMemberships', 'subQueryVariables', 'subQueryChallenges', 'subQueryProjectVariables', 'subQueryTargets', 'subQueryTopicTargets'] as $name) {
+            Database::addFilter(
+                $name,
+                fn () => null,
+                fn () => []
+            );
+        }
+
+        Console::info('Migrating Collections');
+        $this->migrateCollections();
+    }
+
+    /**
+     * Migrate Collections.
+     *
+     * @return void
+     * @throws Exception|Throwable
+     */
+    private function migrateCollections(): void
+    {
+        $internalProjectId = $this->project->getInternalId();
+        $collectionType = match ($internalProjectId) {
+            'console' => 'console',
+            default => 'projects',
+        };
+
+        $collections = $this->collections[$collectionType];
+        foreach ($collections as $collection) {
+            $id = $collection['$id'];
+
+            Console::log("Migrating Collection \"{$id}\"");
+
+            $this->projectDB->setNamespace("_$internalProjectId");
+
+            switch ($id) {
+                case 'installations':
+                    // Create personalAccessToken attribute
+                    try {
+                        $this->createAttributeFromCollection($this->projectDB, $id, 'personalAccessToken');
+                    } catch (Throwable $th) {
+                        Console::warning("'personalAccessToken' from {$id}: {$th->getMessage()}");
+                    }
+
+                    // Create personalAccessTokenExpiry attribute
+                    try {
+                        $this->createAttributeFromCollection($this->projectDB, $id, 'personalAccessTokenExpiry');
+                    } catch (Throwable $th) {
+                        Console::warning("'personalAccessTokenExpiry' from {$id}: {$th->getMessage()}");
+                    }
+
+                    // Create personalRefreshToken attribute
+                    try {
+                        $this->createAttributeFromCollection($this->projectDB, $id, 'personalRefreshToken');
+                    } catch (Throwable $th) {
+                        Console::warning("'personalRefreshToken' from {$id}: {$th->getMessage()}");
+                    }
+                    break;
+            }
+
+            usleep(50000);
+        }
+    }
+}