diff --git a/app/config/collections.php b/app/config/collections.php
index afde813fa1..4c71a404a0 100644
--- a/app/config/collections.php
+++ b/app/config/collections.php
@@ -2278,17 +2278,6 @@ $collections = [
                 'array' => false,
                 'filters' => [],
             ],
-            [
-                '$id' => ID::custom('scheduleUpdatedAt'),
-                'type' => Database::VAR_DATETIME,
-                'format' => '',
-                'size' => 0,
-                'signed' => false,
-                'required' => false,
-                'default' => null,
-                'array' => false,
-                'filters' => ['datetime'],
-            ],
             [
                 '$id' => ID::custom('timeout'),
                 'type' => Database::VAR_INTEGER,
diff --git a/app/controllers/api/functions.php b/app/controllers/api/functions.php
index 6fe7c67e69..67674e3bb5 100644
--- a/app/controllers/api/functions.php
+++ b/app/controllers/api/functions.php
@@ -84,7 +84,6 @@ App::post('/v1/functions')
             'deployment' => '',
             'events' => $events,
             'schedule' => $schedule,
-            'scheduleUpdatedAt' => DateTime::now(),
             'timeout' => $timeout,
             'search' => implode(' ', [$functionId, $name, $runtime])
         ]));
@@ -463,7 +462,6 @@ App::put('/v1/functions/:functionId')
             'name' => $name,
             'events' => $events,
             'schedule' => $schedule,
-            'scheduleUpdatedAt' => DateTime::now(),
             'timeout' => $timeout,
             'enabled' => $enabled,
             'search' => implode(' ', [$functionId, $name, $function->getAttribute('runtime')]),
@@ -471,18 +469,11 @@ App::put('/v1/functions/:functionId')
 
         $schedule = $dbForConsole->getDocument('schedules', $function->getAttribute('scheduleId'));
 
-        /**
-         * In case we want to clear the schedule
-         */
-        if (!empty($function->getAttribute('deployment'))) {
-            $schedule->setAttribute('resourceUpdatedAt', $function->getAttribute('scheduleUpdatedAt'));
-        }
-
         $schedule
+            ->setAttribute('resourceUpdatedAt', DateTime::now())
             ->setAttribute('schedule', $function->getAttribute('schedule'))
             ->setAttribute('active', !empty($function->getAttribute('schedule')) && !empty($function->getAttribute('deployment')));
 
-
         Authorization::skip(fn () => $dbForConsole->updateDocument('schedules', $schedule->getId(), $schedule));
 
         $eventsInstance->setParam('functionId', $function->getId());
@@ -538,15 +529,10 @@ App::patch('/v1/functions/:functionId/deployments/:deploymentId')
         ])));
 
         $schedule = $dbForConsole->getDocument('schedules', $function->getAttribute('scheduleId'));
-
-        $active = !empty($function->getAttribute('schedule'));
-
-        if ($active) {
-            $schedule->setAttribute('resourceUpdatedAt', datetime::now());
-        }
-
-        $schedule->setAttribute('active', $active);
-
+        $schedule
+            ->setAttribute('resourceUpdatedAt', DateTime::now())
+            ->setAttribute('schedule', $function->getAttribute('schedule'))
+            ->setAttribute('active', !empty($function->getAttribute('schedule')) && !empty($function->getAttribute('deployment')));
         Authorization::skip(fn () => $dbForConsole->updateDocument('schedules', $schedule->getId(), $schedule));
 
         $events
@@ -786,22 +772,6 @@ App::post('/v1/functions/:functionId/deployments')
             }
         }
 
-        /**
-         * TODO Should we update also the function collection with the scheduleUpdatedAt attr?
-         */
-
-        $schedule = $dbForConsole->getDocument('schedules', $function->getAttribute('scheduleId'));
-
-        $active = !empty($function->getAttribute('schedule'));
-
-        if ($active) {
-            $schedule->setAttribute('resourceUpdatedAt', datetime::now());
-        }
-
-        $schedule->setAttribute('active', $active);
-
-        Authorization::skip(fn () => $dbForConsole->updateDocument('schedules', $schedule->getId(), $schedule));
-
         $metadata = null;
 
         $events
@@ -1381,7 +1351,8 @@ App::post('/v1/functions/:functionId/variables')
     ->param('value', null, new Text(8192), 'Variable value. Max length: 8192 chars.', false)
     ->inject('response')
     ->inject('dbForProject')
-    ->action(function (string $functionId, string $key, string $value, Response $response, Database $dbForProject) {
+    ->inject('dbForConsole')
+    ->action(function (string $functionId, string $key, string $value, Response $response, Database $dbForProject, Database $dbForConsole) {
         $function = $dbForProject->getDocument('functions', $functionId);
 
         if ($function->isEmpty()) {
@@ -1410,6 +1381,13 @@ App::post('/v1/functions/:functionId/variables')
             throw new Exception(Exception::VARIABLE_ALREADY_EXISTS);
         }
 
+        $schedule = $dbForConsole->getDocument('schedules', $function->getAttribute('scheduleId'));
+        $schedule
+            ->setAttribute('resourceUpdatedAt', DateTime::now())
+            ->setAttribute('schedule', $function->getAttribute('schedule'))
+            ->setAttribute('active', !empty($function->getAttribute('schedule')) && !empty($function->getAttribute('deployment')));
+        Authorization::skip(fn () => $dbForConsole->updateDocument('schedules', $schedule->getId(), $schedule));
+
         $dbForProject->deleteCachedDocument('functions', $function->getId());
 
         $response
@@ -1497,7 +1475,8 @@ App::put('/v1/functions/:functionId/variables/:variableId')
     ->param('value', null, new Text(8192), 'Variable value. Max length: 8192 chars.', true)
     ->inject('response')
     ->inject('dbForProject')
-    ->action(function (string $functionId, string $variableId, string $key, ?string $value, Response $response, Database $dbForProject) {
+    ->inject('dbForConsole')
+    ->action(function (string $functionId, string $variableId, string $key, ?string $value, Response $response, Database $dbForProject, Database $dbForConsole) {
 
         $function = $dbForProject->getDocument('functions', $functionId);
 
@@ -1526,6 +1505,13 @@ App::put('/v1/functions/:functionId/variables/:variableId')
             throw new Exception(Exception::VARIABLE_ALREADY_EXISTS);
         }
 
+        $schedule = $dbForConsole->getDocument('schedules', $function->getAttribute('scheduleId'));
+        $schedule
+            ->setAttribute('resourceUpdatedAt', DateTime::now())
+            ->setAttribute('schedule', $function->getAttribute('schedule'))
+            ->setAttribute('active', !empty($function->getAttribute('schedule')) && !empty($function->getAttribute('deployment')));
+        Authorization::skip(fn () => $dbForConsole->updateDocument('schedules', $schedule->getId(), $schedule));
+
         $dbForProject->deleteCachedDocument('functions', $function->getId());
 
         $response->dynamic($variable, Response::MODEL_VARIABLE);
@@ -1547,7 +1533,8 @@ App::delete('/v1/functions/:functionId/variables/:variableId')
     ->param('variableId', '', new UID(), 'Variable unique ID.', false)
     ->inject('response')
     ->inject('dbForProject')
-    ->action(function (string $functionId, string $variableId, Response $response, Database $dbForProject) {
+    ->inject('dbForConsole')
+    ->action(function (string $functionId, string $variableId, Response $response, Database $dbForProject, Database $dbForConsole) {
         $function = $dbForProject->getDocument('functions', $functionId);
 
         if ($function->isEmpty()) {
@@ -1564,6 +1551,14 @@ App::delete('/v1/functions/:functionId/variables/:variableId')
         }
 
         $dbForProject->deleteDocument('variables', $variable->getId());
+
+        $schedule = $dbForConsole->getDocument('schedules', $function->getAttribute('scheduleId'));
+        $schedule
+            ->setAttribute('resourceUpdatedAt', DateTime::now())
+            ->setAttribute('schedule', $function->getAttribute('schedule'))
+            ->setAttribute('active', !empty($function->getAttribute('schedule')) && !empty($function->getAttribute('deployment')));
+        Authorization::skip(fn () => $dbForConsole->updateDocument('schedules', $schedule->getId(), $schedule));
+
         $dbForProject->deleteCachedDocument('functions', $function->getId());
 
         $response->noContent();
diff --git a/app/workers/builds.php b/app/workers/builds.php
index d26f07ab75..9dfd69b872 100644
--- a/app/workers/builds.php
+++ b/app/workers/builds.php
@@ -202,8 +202,6 @@ class BuildsV1 extends Worker
 
             Console::success("Build id: $buildId created");
 
-            $function->setAttribute('scheduleUpdatedAt', DateTime::now());
-
             /** Set auto deploy */
             if ($deployment->getAttribute('activate') === true) {
                 $function->setAttribute('deployment', $deployment->getId());
@@ -213,7 +211,7 @@ class BuildsV1 extends Worker
             /** Update function schedule */
             $dbForConsole = $this->getConsoleDB();
             $schedule = $dbForConsole->getDocument('schedules', $function->getAttribute('scheduleId'));
-            $schedule->setAttribute('resourceUpdatedAt', $function->getAttribute('scheduleUpdatedAt'));
+            $schedule->setAttribute('resourceUpdatedAt', DateTime::now());
 
             $schedule
                 ->setAttribute('schedule', $function->getAttribute('schedule'))
diff --git a/src/Appwrite/Migration/Version/V17.php b/src/Appwrite/Migration/Version/V17.php
index 66a02662d1..5ee897ae19 100644
--- a/src/Appwrite/Migration/Version/V17.php
+++ b/src/Appwrite/Migration/Version/V17.php
@@ -58,6 +58,17 @@ class V17 extends Migration
                     }
 
                     break;
+                case 'functions':
+                    try {
+                        /**
+                         * Delete 'scheduleUpdatedAt' attribute
+                         */
+                        $this->projectDB->deleteAttribute($id, 'scheduleUpdatedAt');
+                        $this->projectDB->deleteCachedCollection($id);
+                    } catch (\Throwable $th) {
+                        Console::warning("'scheduleUpdatedAt' from {$id}: {$th->getMessage()}");
+                    }
+                    break;
 
                 default:
                     break;