diff --git a/app/http.php b/app/http.php
index 2d7a677ae6..8b9fae8396 100644
--- a/app/http.php
+++ b/app/http.php
@@ -20,15 +20,14 @@ use Utopia\Database\Helpers\ID;
 use Utopia\Database\Helpers\Permission;
 use Utopia\Database\Helpers\Role;
 use Utopia\Database\Validator\Authorization;
-use Utopia\DI\Container;
 use Utopia\Http\Adapter\Swoole\Server;
 use Utopia\Http\Http;
 use Utopia\System\System;
 
-// Unlimited memory limit to handle as many coroutines/requests as possible
-ini_set('memory_limit', '-1');
+//require_once __DIR__ . '/init.php';
+require_once __DIR__ . '/init2.php';
+require_once __DIR__ . '/controllers/general.php';
 
-$container = new Container();
 $workerNumber = swoole_cpu_num() * intval(System::getEnv('_APP_WORKER_PER_CORE', 6));
 $payloadSize = 6 * (1024 * 1024); // 6MB
 
@@ -58,11 +57,7 @@ $http = new Http($server, $container, 'UTC');
 $http->setRequestClass(Request::class);
 $http->setResponseClass(Response::class);
 
-//require_once __DIR__ . '/init.php';
-require_once __DIR__ . '/init2.php';
-require_once __DIR__ . '/controllers/general.php';
-
-global $global;
+global $global, $container;
 
 http::onStart()
     ->inject('authorization')
diff --git a/app/init2.php b/app/init2.php
index 2d71d9f0f3..54a06a210f 100644
--- a/app/init2.php
+++ b/app/init2.php
@@ -6,6 +6,9 @@ require_once __DIR__ . '/init/locale.php';
 require_once __DIR__ . '/init/database/filters.php';
 require_once __DIR__ . '/init/database/formats.php';
 
+// Unlimited memory limit to handle as many coroutines/requests as possible
+ini_set('memory_limit', '-1');
+
 global $http, $container;
 
 use Ahc\Jwt\JWT;
@@ -83,6 +86,7 @@ use Utopia\Storage\Storage;
 use Utopia\System\System;
 use Utopia\VCS\Adapter\Git\GitHub as VcsGitHub;
 use Utopia\Cache\Adapter\None;
+use Utopia\DI\Container;
 
 Http::setMode(System::getEnv('_APP_ENV', Http::MODE_TYPE_PRODUCTION));
 
@@ -174,6 +178,7 @@ function getDevice($root): Device
     }
 }
 
+$container = new Container();
 $global = new Registry();
 
 $global->set('logger', function () {