diff --git a/src/Appwrite/Migration/Version/V21.php b/src/Appwrite/Migration/Version/V21.php
index a75ba58949..7dd2912234 100644
--- a/src/Appwrite/Migration/Version/V21.php
+++ b/src/Appwrite/Migration/Version/V21.php
@@ -68,35 +68,6 @@ class V21 extends Migration
                     } catch (Throwable $th) {
                         Console::warning("'accessedAt' from {$id}: {$th->getMessage()}");
                     }
-                    break;
-                case 'executions':
-                    try {
-                        /**
-                         * Create 'scheduledAt' attribute
-                         */
-                        $this->createAttributeFromCollection($this->projectDB, $id, 'scheduledAt');
-                    } catch (\Throwable $th) {
-                        Console::warning("'scheduledAt' from {$id}: {$th->getMessage()}");
-                    }
-
-                    try {
-                        /**
-                         * Create 'scheduleInternalId' attribute
-                         */
-                        $this->createAttributeFromCollection($this->projectDB, $id, 'scheduleInternalId');
-                    } catch (\Throwable $th) {
-                        Console::warning("'scheduleInternalId' from {$id}: {$th->getMessage()}");
-                    }
-
-                    try {
-                        /**
-                         * Create 'scheduleId' attribute
-                         */
-                        $this->createAttributeFromCollection($this->projectDB, $id, 'scheduleId');
-                    } catch (\Throwable $th) {
-                        Console::warning("'scheduleId' from {$id}: {$th->getMessage()}");
-                    }
-
                     break;
                 case 'schedules':
                     // Create data attribute
@@ -145,6 +116,33 @@ class V21 extends Migration
                     } catch (\Throwable $th) {
                         Console::warning("'_key_deployment' from {$id}: {$th->getMessage()}");
                     }
+
+                    try {
+                        /**
+                         * Create 'scheduledAt' attribute
+                         */
+                        $this->createAttributeFromCollection($this->projectDB, $id, 'scheduledAt');
+                    } catch (\Throwable $th) {
+                        Console::warning("'scheduledAt' from {$id}: {$th->getMessage()}");
+                    }
+
+                    try {
+                        /**
+                         * Create 'scheduleInternalId' attribute
+                         */
+                        $this->createAttributeFromCollection($this->projectDB, $id, 'scheduleInternalId');
+                    } catch (\Throwable $th) {
+                        Console::warning("'scheduleInternalId' from {$id}: {$th->getMessage()}");
+                    }
+
+                    try {
+                        /**
+                         * Create 'scheduleId' attribute
+                         */
+                        $this->createAttributeFromCollection($this->projectDB, $id, 'scheduleId');
+                    } catch (\Throwable $th) {
+                        Console::warning("'scheduleId' from {$id}: {$th->getMessage()}");
+                    }
             }
 
             usleep(50000);