diff --git a/app/config/collections/common.php b/app/config/collections/common.php
index e77d5403d2..6de7eb224b 100644
--- a/app/config/collections/common.php
+++ b/app/config/collections/common.php
@@ -1439,13 +1439,6 @@ return [
                 'lengths' => [],
                 'orders' => [Database::ORDER_ASC],
             ],
-            [
-                '$id' => ID::custom('_key_roles'),
-                'type' => Database::INDEX_KEY,
-                'attributes' => ['roles'],
-                'lengths' => [128],
-                'orders' => [],
-            ],
         ],
     ],
 
diff --git a/src/Appwrite/Migration/Version/V22.php b/src/Appwrite/Migration/Version/V22.php
index 2a6a64ed48..cfe4f1fe57 100644
--- a/src/Appwrite/Migration/Version/V22.php
+++ b/src/Appwrite/Migration/Version/V22.php
@@ -150,9 +150,9 @@ class V22 extends Migration
                     ];
                     foreach ($indexes as $index) {
                         try {
-                            $this->createIndexFromCollection($this->dbForProject, $id, $index);
+                            $this->dbForProject->deleteIndex($id, $index);
                         } catch (Throwable $th) {
-                            Console::warning("Failed to create index \"$index\" from {$id}: {$th->getMessage()}");
+                            Console::warning("Failed to delete index \"$index\" from {$id}: {$th->getMessage()}");
                         }
                     }
                     $this->dbForProject->purgeCachedCollection($id);