diff --git a/src/Appwrite/Platform/Tasks/Maintenance.php b/src/Appwrite/Platform/Tasks/Maintenance.php
index fd9d05dec9..47f9262006 100644
--- a/src/Appwrite/Platform/Tasks/Maintenance.php
+++ b/src/Appwrite/Platform/Tasks/Maintenance.php
@@ -4,9 +4,11 @@ namespace Appwrite\Platform\Tasks;
 
 use Appwrite\Event\Certificate;
 use Appwrite\Event\Delete;
+use DateInterval;
+use DateTime;
 use Utopia\CLI\Console;
 use Utopia\Database\Database;
-use Utopia\Database\DateTime;
+use Utopia\Database\DateTime as DatabaseDateTime;
 use Utopia\Database\Document;
 use Utopia\Database\Query;
 use Utopia\Platform\Action;
@@ -58,29 +60,35 @@ class Maintenance extends Action
         Console::info('Setting loop start time to ' . $next->format("Y-m-d H:i:s.v") . '. Delaying for ' . $delay . ' seconds.');
 
         Console::loop(function () use ($interval, $cacheRetention, $schedulesDeletionRetention, $usageStatsRetentionHourly, $dbForPlatform, $console, $queueForDeletes, $queueForCertificates) {
-            $time = DateTime::now();
+            $time = DatabaseDateTime::now();
 
             Console::info("[{$time}] Notifying workers with maintenance tasks every {$interval} seconds");
 
+            // Iterate through project only if it was accessed in last 24 hours
+            $dateInterval  = DateInterval::createFromDateString('24 hours');
+            $before24h = (new DateTime())->sub($dateInterval);
+
             $dbForPlatform->foreach(
                 'projects',
                 function (Document $project) use ($queueForDeletes, $usageStatsRetentionHourly) {
                     $queueForDeletes
                         ->setType(DELETE_TYPE_MAINTENANCE)
                         ->setProject($project)
-                        ->setUsageRetentionHourlyDateTime(DateTime::addSeconds(new \DateTime(), -1 * $usageStatsRetentionHourly))
+                        ->setUsageRetentionHourlyDateTime(DatabaseDateTime::addSeconds(new \DateTime(), -1 * $usageStatsRetentionHourly))
                         ->trigger();
                 },
                 [
                     Query::equal('region', [System::getEnv('_APP_REGION', 'default')]),
                     Query::limit(100),
+                    Query::greaterThanEqual('accessedAt', DatabaseDateTime::format($before24h)),
+                    Query::orderAsc('teamInternalId'),
                 ]
             );
 
             $queueForDeletes
                 ->setType(DELETE_TYPE_MAINTENANCE)
                 ->setProject($console)
-                ->setUsageRetentionHourlyDateTime(DateTime::addSeconds(new \DateTime(), -1 * $usageStatsRetentionHourly))
+                ->setUsageRetentionHourlyDateTime(DatabaseDateTime::addSeconds(new \DateTime(), -1 * $usageStatsRetentionHourly))
                 ->trigger();
 
             $this->notifyDeleteConnections($queueForDeletes);
@@ -94,13 +102,13 @@ class Maintenance extends Action
     {
         $queueForDeletes
             ->setType(DELETE_TYPE_REALTIME)
-            ->setDatetime(DateTime::addSeconds(new \DateTime(), -60))
+            ->setDatetime(DatabaseDateTime::addSeconds(new \DateTime(), -60))
             ->trigger();
     }
 
     private function renewCertificates(Database $dbForPlatform, Certificate $queueForCertificate): void
     {
-        $time = DateTime::now();
+        $time = DatabaseDateTime::now();
 
         $certificates = $dbForPlatform->find('certificates', [
             Query::lessThan('attempts', 5), // Maximum 5 attempts
@@ -129,7 +137,7 @@ class Maintenance extends Action
     {
         $queueForDeletes
             ->setType(DELETE_TYPE_CACHE_BY_TIMESTAMP)
-            ->setDatetime(DateTime::addSeconds(new \DateTime(), -1 * $interval))
+            ->setDatetime(DatabaseDateTime::addSeconds(new \DateTime(), -1 * $interval))
             ->trigger();
     }
 
@@ -137,7 +145,7 @@ class Maintenance extends Action
     {
         $queueForDeletes
             ->setType(DELETE_TYPE_SCHEDULES)
-            ->setDatetime(DateTime::addSeconds(new \DateTime(), -1 * $interval))
+            ->setDatetime(DatabaseDateTime::addSeconds(new \DateTime(), -1 * $interval))
             ->trigger();
     }
 }