diff --git a/.env b/.env
index f042b1686d..fee6c6653d 100644
--- a/.env
+++ b/.env
@@ -24,7 +24,7 @@ _APP_DB_SCHEMA=appwrite
 _APP_DB_USER=user
 _APP_DB_PASS=password
 _APP_DB_ROOT_PASS=rootsecretpassword
-_APP_CONNECTIONS_MAX=251
+_APP_CONNECTIONS_MAX=3100
 _APP_POOL_CLIENTS=14
 _APP_CONNECTIONS_DB_PROJECT=db_fra1_02=mariadb://user:password@mariadb:3306/appwrite
 _APP_CONNECTIONS_DB_CONSOLE=db_fra1_01=mariadb://user:password@mariadb:3306/appwrite
@@ -64,7 +64,7 @@ _APP_MAINTENANCE_RETENTION_CACHE=2592000
 _APP_MAINTENANCE_RETENTION_EXECUTION=1209600
 _APP_MAINTENANCE_RETENTION_ABUSE=86400
 _APP_MAINTENANCE_RETENTION_AUDIT=1209600
-_APP_MAINTENANCE_RETENTION_SCHEDULES=86400
+_APP_MAINTENANCE_RETENTION_SCHEDULES=600
 _APP_MAINTENANCE_RETENTION_USAGE_HOURLY=8640000
 _APP_USAGE_STATS=enabled
 _APP_USAGE_AGGREGATION_INTERVAL=30
diff --git a/app/workers/deletes.php b/app/workers/deletes.php
index b8efa38ae6..458b341a45 100644
--- a/app/workers/deletes.php
+++ b/app/workers/deletes.php
@@ -134,8 +134,7 @@ class DeletesV1 extends Worker
      */
     protected function deleteSchedules(string $datetime): void
     {
-
-        $this->deleteByGroup(
+        $this->listByGroup(
             'schedules',
             [
                 Query::equal('region', [App::getEnv('_APP_REGION', 'default')]),
@@ -145,7 +144,6 @@ class DeletesV1 extends Worker
             ],
             $this->getConsoleDB(),
             function (Document $document) {
-                Console::info('Querying schedule for function ' . $document->getAttribute('resourceId'));
                 $project = $this->getConsoleDB()->getDocument('projects', $document->getAttribute('projectId'));
 
                 if ($project->isEmpty()) {
@@ -358,8 +356,15 @@ class DeletesV1 extends Worker
 
     protected function deleteExpiredSessions(): void
     {
-        $this->deleteForProjectIds(function (Document $project) use ($datetime) {
+        $consoleDB = $this->getConsoleDB();
+
+        $this->deleteForProjectIds(function (Document $project) use ($consoleDB) {
             $dbForProject = $this->getProjectDB($project);
+
+            $project = $consoleDB->getDocument('projects', $project->getId());
+            $duration = $project->getAttribute('auths', [])['duration'] ?? Auth::TOKEN_EXPIRATION_LOGIN_LONG;
+            $expired = DateTime::addSeconds(new \DateTime(), -1 * $duration);
+
             // Delete Sessions
             $this->deleteByGroup('sessions', [
                 Query::lessThan('$createdAt', $expired)
@@ -569,6 +574,7 @@ class DeletesV1 extends Worker
      */
     protected function deleteForProjectIds(callable $callback): void
     {
+        // TODO: @Meldiron name of this method no longer matches. It does not delete, and it gives whole document
         $count = 0;
         $chunk = 0;
         $limit = 50;
@@ -632,6 +638,43 @@ class DeletesV1 extends Worker
         Console::info("Deleted {$count} document by group in " . ($executionEnd - $executionStart) . " seconds");
     }
 
+    /**
+     * @param string $collection collectionID
+     * @param Query[] $queries
+     * @param Database $database
+     * @param callable $callback
+     */
+    protected function listByGroup(string $collection, array $queries, Database $database, callable $callback = null): void
+    {
+        $count = 0;
+        $chunk = 0;
+        $limit = 50;
+        $results = [];
+        $sum = $limit;
+
+        $executionStart = \microtime(true);
+
+        while ($sum === $limit) {
+            $chunk++;
+
+            $results = $database->find($collection, \array_merge([Query::limit($limit)], $queries));
+
+            $sum = count($results);
+
+            foreach ($results as $document) {
+                if (is_callable($callback)) {
+                    $callback($document);
+                }
+
+                $count++;
+            }
+        }
+
+        $executionEnd = \microtime(true);
+
+        Console::info("Listed {$count} document by group in " . ($executionEnd - $executionStart) . " seconds");
+    }
+
     /**
      * @param Document $document certificates document
      */