diff --git a/app/config/collections.php b/app/config/collections.php
index b8667d0b8d..e4dadcf0fc 100644
--- a/app/config/collections.php
+++ b/app/config/collections.php
@@ -5772,7 +5772,7 @@ $bucketCollections = [
                 '$id' => ID::custom('metadata'),
                 'type' => Database::VAR_STRING,
                 'format' => '',
-                'size' => 16384, // https://tools.ietf.org/html/rfc4288#section-4.2
+                'size' => 75000, // https://tools.ietf.org/html/rfc4288#section-4.2
                 'signed' => true,
                 'required' => false,
                 'default' => null,
diff --git a/src/Appwrite/Migration/Version/V21.php b/src/Appwrite/Migration/Version/V21.php
index 7dd2912234..af2d86a2ba 100644
--- a/src/Appwrite/Migration/Version/V21.php
+++ b/src/Appwrite/Migration/Version/V21.php
@@ -34,6 +34,11 @@ class V21 extends Migration
         Console::info('Migrating Collections');
         $this->migrateCollections();
 
+        if ($this->project->getInternalId() !== 'console') {
+            Console::info('Migrating Buckets');
+            $this->migrateBuckets();
+        }
+
         Console::info('Migrating Documents');
         $this->forEachDocument([$this, 'fixDocument']);
     }
@@ -177,4 +182,23 @@ class V21 extends Migration
 
         return $document;
     }
+
+    /**
+     * Migrating Buckets.
+     *
+     * @return void
+     */
+    private function migrateBuckets()
+    {
+        foreach ($this->documentsIterator('buckets') as $bucket) {
+            $bucketId = 'bucket_' . $bucket['$internalId'];
+
+            try {
+                $this->projectDB->updateAttribute($bucketId, 'metadata', size: 75000);
+                $this->projectDB->purgeCachedCollection($bucketId);
+            } catch (\Throwable $th) {
+                Console::warning("'bucketId' from {$bucketId}: {$th->getMessage()}");
+            }
+        }
+    }
 }