diff --git a/app/init.php b/app/init.php
index 067fd70204..31f82740b6 100644
--- a/app/init.php
+++ b/app/init.php
@@ -565,7 +565,6 @@ $register->set('pools', function () {
         $dsns = $connection['dsns'] ?? '';
         $multipe = $connection['multiple'] ?? false;
         $schemes = $connection['schemes'] ?? [];
-        $useResource = $connection['useResource'] ?? true;
         $config = [];
         $dsns = explode(',', $connection['dsns'] ?? '');
 
diff --git a/app/worker.php b/app/worker.php
index eb7e570007..42a5f92439 100644
--- a/app/worker.php
+++ b/app/worker.php
@@ -16,6 +16,7 @@ use Utopia\Queue\Message;
 use Utopia\Queue\Server;
 use Utopia\Registry\Registry;
 use Utopia\Logger\Log;
+use Utopia\Logger\Logger;
 
 Runtime::enableCoroutine(SWOOLE_HOOK_ALL);
 
@@ -107,9 +108,7 @@ $server
     ->error()
     ->inject('error')
     ->inject('logger')
-    ->inject('register')
-    ->action(function ($error, $logger, $register) {
-
+    ->action(function (Throwable $error, Logger $logger) {
         $version = App::getEnv('_APP_VERSION', 'UNKNOWN');
 
         if ($error instanceof PDOException) {
@@ -124,7 +123,7 @@ $server
             $log->setVersion($version);
             $log->setType(Log::TYPE_ERROR);
             $log->setMessage($error->getMessage());
-            $log->setAction('appwrite-worker-functions');
+            $log->setAction('appwrite-queue-' . App::getEnv('QUEUE'));
             $log->addTag('verboseType', get_class($error));
             $log->addTag('code', $error->getCode());
             $log->addExtra('file', $error->getFile());
@@ -143,6 +142,4 @@ $server
         Console::error('[Error] Message: ' . $error->getMessage());
         Console::error('[Error] File: ' . $error->getFile());
         Console::error('[Error] Line: ' . $error->getLine());
-
-        $register->get('pools')->reclaim();
     });
diff --git a/app/workers/builds.php b/app/workers/builds.php
index 48d430eaa7..1fa86b99a8 100644
--- a/app/workers/builds.php
+++ b/app/workers/builds.php
@@ -111,15 +111,13 @@ class BuildsV1 extends Worker
         /** Trigger Webhook */
         $deploymentModel = new Deployment();
 
-        $data = $deployment->getArrayCopy(array_keys($deploymentModel->getRules()));
-
         $deploymentUpdate = new Event(Event::WEBHOOK_QUEUE_NAME, Event::WEBHOOK_CLASS_NAME);
         $deploymentUpdate
             ->setProject($project)
             ->setEvent('functions.[functionId].deployments.[deploymentId].update')
             ->setParam('functionId', $function->getId())
             ->setParam('deploymentId', $deployment->getId())
-            ->setPayload($data)
+            ->setPayload($deployment->getArrayCopy(array_keys($deploymentModel->getRules())))
             ->trigger();
 
         /** Trigger Functions */
@@ -127,11 +125,7 @@ class BuildsV1 extends Worker
         $connection = $pools->get('queue')->pop();
         $functions = new Func($connection->getResource());
         $functions
-            ->setData(\json_encode($data))
-            ->setProject($project)
-            ->setEvent('functions.[functionId].deployments.[deploymentId].update')
-            ->setParam('functionId', $function->getId())
-            ->setParam('deploymentId', $deployment->getId())
+            ->from($deploymentUpdate)
             ->trigger();
         $connection->reclaim();
 
diff --git a/src/Appwrite/Platform/Tasks/Schedule.php b/src/Appwrite/Platform/Tasks/Schedule.php
index bafedd27cb..1d89d85a04 100644
--- a/src/Appwrite/Platform/Tasks/Schedule.php
+++ b/src/Appwrite/Platform/Tasks/Schedule.php
@@ -187,12 +187,7 @@ class Schedule extends Action
 
                         $promiseStart = \time(); // in seconds
                         $executionStart = $nextDate->getTimestamp(); // in seconds
-                        $executionSleep = $executionStart - $promiseStart; // Time to wait from now until execution needs to be queued
-                        $delay = $executionSleep;
-
-                        \var_dump($delay);
-                        \var_dump(\time());
-                        \var_dump('---');
+                        $delay = $executionStart - $promiseStart; // Time to wait from now until execution needs to be queued
 
                         if (!isset($delayedExecutions[$delay])) {
                             $delayedExecutions[$delay] = [];