diff --git a/app/controllers/api/migrations.php b/app/controllers/api/migrations.php
index e00bb082b8..4dedba1b46 100644
--- a/app/controllers/api/migrations.php
+++ b/app/controllers/api/migrations.php
@@ -32,81 +32,40 @@ use Utopia\Validator\WhiteList;
 
 include_once __DIR__ . '/../shared/api.php';
 
-$triggerMigration = function (string $migrationId, array $resources, Migration $queueForMigrations) {
-    $groupDocument = new Document([
-        '$id' => ID::unique(),
-        'status' => 'pending',
-        'migrationId' => $migrationId,
-        'group' => '',
-        'resources' => [],
-        'statusCounters' => '',
-        'resourceData' => '',
-        'errors' => []
-    ]);
+$triggerMigration = function (string $migrationId, array $resources, Migration $queueForMigrations, Database $dbForProject) {
+    $groups = [
+        Transfer::GROUP_AUTH => Transfer::GROUP_AUTH_RESOURCES,
+        Transfer::GROUP_DATABASES => Transfer::GROUP_DATABASES_RESOURCES,
+        Transfer::GROUP_FUNCTIONS => Transfer::GROUP_FUNCTIONS_RESOURCES,
+        Transfer::GROUP_STORAGE => Transfer::GROUP_STORAGE_RESOURCES
+    ];
 
-    if (!empty(array_intersect(
-        Transfer::GROUP_AUTH_RESOURCES,
-        $resources
-    ))) {
-        $groupDocument->setAttribute('$id', ID::unique());
-        $groupDocument->setAttribute('group', Migration::TYPE_AUTH);
-        $groupDocument->setAttribute('resources', array_intersect(
-            Transfer::GROUP_AUTH_RESOURCES,
+    foreach ($groups as $group => $groupResources) {
+        if (!empty(array_intersect(
+            $groupResources,
             $resources
-        ));
-
-        $queueForMigrations
-            ->setType(Migration::TYPE_AUTH)
-            ->setMigration($groupDocument)
-            ->trigger();
-    }
-
-    if (!empty(array_intersect(
-        Transfer::GROUP_STORAGE_RESOURCES,
-        $resources
-    ))) {
-        $groupDocument->setAttribute('$id', ID::unique());
-        $groupDocument->setAttribute('group', Migration::TYPE_STORAGE);
-        $groupDocument->setAttribute('resources', array_intersect(
-            Transfer::GROUP_STORAGE_RESOURCES,
-            $resources
-        ));
-
-        $queueForMigrations
-            ->setMigration($groupDocument)
-            ->trigger();
-    }
-
-    if (!empty(array_intersect(
-        Transfer::GROUP_DATABASES_RESOURCES,
-        $resources
-    ))) {
-        $groupDocument->setAttribute('$id', ID::unique());
-        $groupDocument->setAttribute('group', Migration::TYPE_DATABASES);
-        $groupDocument->setAttribute('resources', array_intersect(
-            Transfer::GROUP_DATABASES_RESOURCES,
-            $resources
-        ));
-
-        $queueForMigrations
-            ->setMigration($groupDocument)
-            ->trigger();
-    }
-
-    if (!empty(array_intersect(
-        Transfer::GROUP_FUNCTIONS_RESOURCES,
-        $resources
-    ))) {
-        $groupDocument->setAttribute('$id', ID::unique());
-        $groupDocument->setAttribute('group', Migration::TYPE_FUNCTIONS);
-        $groupDocument->setAttribute('resources', array_intersect(
-            Transfer::GROUP_FUNCTIONS_RESOURCES,
-            $resources
-        ));
-
-        $queueForMigrations
-            ->setMigration($groupDocument)
-            ->trigger();
+        ))) {
+            $groupDocument = new Document([
+                '$id' => ID::unique(),
+                'status' => 'pending',
+                'migrationId' => $migrationId,
+                'group' => $group,
+                'resources' => array_intersect(
+                    $groupResources,
+                    $resources
+                ),
+                'statusCounters' => '',
+                'resourceData' => '',
+                'errors' => []
+            ]);
+    
+            $dbForProject->createDocument('groupMigrations', $groupDocument);
+    
+            $queueForMigrations
+                ->setType($group)
+                ->setMigration($groupDocument)
+                ->trigger();
+        }
     }
 };
 
@@ -154,7 +113,7 @@ App::post('/v1/migrations/appwrite')
             ->setProject($project)
             ->setUser($user);
 
-        $triggerMigration($migration->getId(), $resources, $queueForMigrations);
+        $triggerMigration($migration->getId(), $resources, $queueForMigrations, $dbForProject);
 
         $response
             ->setStatusCode(Response::STATUS_CODE_ACCEPTED)
@@ -255,7 +214,7 @@ App::post('/v1/migrations/firebase/oauth')
             ->setProject($project)
             ->setUser($user);
 
-        $triggerMigration($migration->getId(), $resources, $queueForMigrations);
+        $triggerMigration($migration->getId(), $resources, $queueForMigrations, $dbForProject);
 
         $response
             ->setStatusCode(Response::STATUS_CODE_ACCEPTED)
@@ -314,7 +273,7 @@ App::post('/v1/migrations/firebase')
             ->setProject($project)
             ->setUser($user);
 
-        $triggerMigration($migration->getId(), $resources, $queueForMigrations);
+        $triggerMigration($migration->getId(), $resources, $queueForMigrations, $dbForProject);
 
         $response
             ->setStatusCode(Response::STATUS_CODE_ACCEPTED)
@@ -373,7 +332,7 @@ App::post('/v1/migrations/supabase')
             ->setProject($project)
             ->setUser($user);
 
-        $triggerMigration($migration->getId(), $resources, $queueForMigrations);
+        $triggerMigration($migration->getId(), $resources, $queueForMigrations, $dbForProject);
 
         $response
             ->setStatusCode(Response::STATUS_CODE_ACCEPTED)
@@ -434,7 +393,7 @@ App::post('/v1/migrations/nhost')
             ->setProject($project)
             ->setUser($user);
 
-        $triggerMigration($migration->getId(), $resources, $queueForMigrations);
+        $triggerMigration($migration->getId(), $resources, $queueForMigrations, $dbForProject);
 
         $response
             ->setStatusCode(Response::STATUS_CODE_ACCEPTED)
diff --git a/docker-compose.yml b/docker-compose.yml
index 29d956d512..33955dbb11 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -595,7 +595,7 @@ services:
   appwrite-worker-migrations:
     entrypoint: worker-migrations
     <<: *x-logging
-    # container_name: appwrite-worker-migrations
+    container_name: appwrite-worker-migrations
     restart: unless-stopped
     image: appwrite-dev
     networks:
@@ -609,6 +609,7 @@ services:
     environment:
       - _APP_ENV
       - _APP_WORKER_PER_CORE
+      - _APP_WORKERS_NUM=8
       - _APP_OPENSSL_KEY_V1
       - _APP_DOMAIN
       - _APP_DOMAIN_TARGET
@@ -624,9 +625,6 @@ services:
       - _APP_DB_PASS
       - _APP_LOGGING_PROVIDER
       - _APP_LOGGING_CONFIG
-    deploy:
-      mode: replicated
-      replicas: 4
 
   appwrite-task-maintenance:
     entrypoint: maintenance