diff --git a/lib/classes/DIContainer.php b/lib/classes/DIContainer.php
index 22d0d857129fe18e5c350e2159ae32c8d5c9edaa..9f0721b67d590354bc296c05a5bca83244284ce1 100644
--- a/lib/classes/DIContainer.php
+++ b/lib/classes/DIContainer.php
@@ -52,6 +52,12 @@ class DIContainer
         $builder->ignorePhpDocErrors(true);
         $builder->addDefinitions('lib/bootstrap-definitions.php');
 
+        $jsonapiSettings = require 'lib/classes/JsonApi/settings.php';
+        $jsonapiSettings($builder);
+
+        $jsonapiDependencies = require 'lib/classes/JsonApi/dependencies.php';
+        $jsonapiDependencies($builder);
+
         return $builder;
     }
 }
diff --git a/public/jsonapi.php b/public/jsonapi.php
index 1dfd51bdb450ad2521ad128383aa0aac311e48db..ba73885a3ccac4089dcd9a3903321896a3ace0cd 100644
--- a/public/jsonapi.php
+++ b/public/jsonapi.php
@@ -18,18 +18,8 @@ page_open([
 // Set base url for URLHelper class
 URLHelper::setBaseUrl($GLOBALS['CANONICAL_RELATIVE_PATH_STUDIP']);
 
-$containerBuilder = new ContainerBuilder();
-
-$settings = require 'lib/classes/JsonApi/settings.php';
-$settings($containerBuilder);
-
-$dependencies = require 'lib/classes/JsonApi/dependencies.php';
-$dependencies($containerBuilder);
-
-// Build PHP_DI Container
-$container = $containerBuilder->build();
-
 // Instantiate the app
+$container = app();
 AppFactory::setContainer($container);
 $app = AppFactory::create();
 $container->set(\Slim\App::class, $app);