diff --git a/src/App.php b/src/App.php
index 931e6c542c..f16c2f89fd 100644
--- a/src/App.php
+++ b/src/App.php
@@ -440,14 +440,14 @@ class App
 
 	public function processJetstream(): void
 	{
-		/** @var \Friendica\Core\Addon\Capability\ICanLoadAddons $addonLoader */
-		$addonLoader = $this->container->create(\Friendica\Core\Addon\Capability\ICanLoadAddons::class);
-		$this->container = $this->container->addRules($addonLoader->getActiveAddonConfig('dependencies'));
+		$this->setupContainerForAddons();
 
-		$this->container = $this->container->addRule(LoggerInterface::class, ['constructParams' => [Logger\Capability\LogChannel::DAEMON]]);
+		$this->setupContainerForLogger(LogChannel::DAEMON);
+
+		$this->setupLegacyServiceLocator();
+
+		$this->registerErrorHandler();
 
-		DI::init($this->container);
-		\Friendica\Core\Logger\Handler\ErrorHandler::register($this->container->create(\Psr\Log\LoggerInterface::class));
 		Addon::loadAddons();
 		Hook::loadHooks();
 		DI::config()->reload();