diff --git a/ajax.php b/ajax.php
index d0a4516458..b646dceb4b 100644
--- a/ajax.php
+++ b/ajax.php
@@ -22,16 +22,12 @@ $_GET['ajax_request'] = 'true';
 
 require_once ROOT_PATH . 'libraries/common.inc.php';
 
-$container = Container::getDefaultContainer();
-$container->set(Response::class, Response::getInstance());
-
 /** @var Response $response */
-$response = $container->get(Response::class);
+$response = $containerBuilder->get(Response::class);
+$response->setAjax(true);
 
 /** @var DatabaseInterface $dbi */
-$dbi = $container->get(DatabaseInterface::class);
-
-$response->setAjax(true);
+$dbi = $containerBuilder->get(DatabaseInterface::class);
 
 /** @var AjaxController $controller */
 $controller = $containerBuilder->get(AjaxController::class);
diff --git a/browse_foreigners.php b/browse_foreigners.php
index 6a915b4dc6..f7014397f6 100644
--- a/browse_foreigners.php
+++ b/browse_foreigners.php
@@ -23,14 +23,11 @@ require_once ROOT_PATH . 'libraries/common.inc.php';
 
 Util::checkParameters(['db', 'table', 'field'], true);
 
-$container = Container::getDefaultContainer();
-$container->set(Response::class, Response::getInstance());
-
 /** @var Response $response */
-$response = $container->get(Response::class);
+$response = $containerBuilder->get(Response::class);
 
 /** @var DatabaseInterface $dbi */
-$dbi = $container->get(DatabaseInterface::class);
+$dbi = $containerBuilder->get(DatabaseInterface::class);
 
 /** @var Template $template */
 $template = $containerBuilder->get('template');
diff --git a/chk_rel.php b/chk_rel.php
index 027541cf9a..13d9954e3c 100644
--- a/chk_rel.php
+++ b/chk_rel.php
@@ -18,14 +18,11 @@ if (! defined('ROOT_PATH')) {
 
 require_once ROOT_PATH . 'libraries/common.inc.php';
 
-$container = Container::getDefaultContainer();
-$container->set(Response::class, Response::getInstance());
-
 /** @var Response $response */
-$response = $container->get(Response::class);
+$response = $containerBuilder->get(Response::class);
 
 /** @var DatabaseInterface $dbi */
-$dbi = $container->get(DatabaseInterface::class);
+$dbi = $containerBuilder->get(DatabaseInterface::class);
 
 /** @var Relation $relation */
 $relation = $containerBuilder->get('relation');
diff --git a/db_central_columns.php b/db_central_columns.php
index ce9965f93e..3cf500c2b5 100644
--- a/db_central_columns.php
+++ b/db_central_columns.php
@@ -28,10 +28,10 @@ $container = Container::getDefaultContainer();
 $container->set(Response::class, Response::getInstance());
 
 /** @var Response $response */
-$response = $container->get(Response::class);
+$response = $containerBuilder->get(Response::class);
 
 /** @var DatabaseInterface $dbi */
-$dbi = $container->get(DatabaseInterface::class);
+$dbi = $containerBuilder->get(DatabaseInterface::class);
 
 $centralColumns = new CentralColumns($dbi);
 /* Define dependencies for the concerned controller */
diff --git a/db_datadict.php b/db_datadict.php
index 03fa55f1d8..f0e9e921fe 100644
--- a/db_datadict.php
+++ b/db_datadict.php
@@ -30,7 +30,7 @@ $container = Container::getDefaultContainer();
 $container->set(Response::class, Response::getInstance());
 
 /** @var Response $response */
-$response = $container->get(Response::class);
+$response = $containerBuilder->get(Response::class);
 
 /* Define dependencies for the concerned controller */
 $dependency_definitions = [
diff --git a/db_designer.php b/db_designer.php
index ebfaacb525..1041f02442 100644
--- a/db_designer.php
+++ b/db_designer.php
@@ -21,14 +21,11 @@ global $db;
 
 require_once ROOT_PATH . 'libraries/common.inc.php';
 
-$container = Container::getDefaultContainer();
-$container->set(Response::class, Response::getInstance());
-
 /** @var Response $response */
-$response = $container->get(Response::class);
+$response = $containerBuilder->get(Response::class);
 
 /** @var DatabaseInterface $dbi */
-$dbi = $container->get(DatabaseInterface::class);
+$dbi = $containerBuilder->get(DatabaseInterface::class);
 
 /** @var Designer $databaseDesigner */
 $databaseDesigner = $containerBuilder->get('designer');
diff --git a/db_events.php b/db_events.php
index 3e8521aed5..a581f491e0 100644
--- a/db_events.php
+++ b/db_events.php
@@ -27,10 +27,10 @@ $container = Container::getDefaultContainer();
 $container->set(Response::class, Response::getInstance());
 
 /** @var Response $response */
-$response = $container->get(Response::class);
+$response = $containerBuilder->get(Response::class);
 
 /** @var DatabaseInterface $dbi */
-$dbi = $container->get(DatabaseInterface::class);
+$dbi = $containerBuilder->get(DatabaseInterface::class);
 
 $_PMA_RTE = 'EVN';
 
diff --git a/db_export.php b/db_export.php
index aec0b9a53d..6ab89d2a00 100644
--- a/db_export.php
+++ b/db_export.php
@@ -24,14 +24,11 @@ global $db, $table, $url_query;
 
 require_once ROOT_PATH . 'libraries/common.inc.php';
 
-$container = Container::getDefaultContainer();
-$container->set(Response::class, Response::getInstance());
-
 /** @var Response $response */
-$response = $container->get(Response::class);
+$response = $containerBuilder->get(Response::class);
 
 /** @var DatabaseInterface $dbi */
-$dbi = $container->get(DatabaseInterface::class);
+$dbi = $containerBuilder->get(DatabaseInterface::class);
 
 PageSettings::showGroup('Export');
 
diff --git a/db_multi_table_query.php b/db_multi_table_query.php
index 2adf0aa96d..76d39059de 100644
--- a/db_multi_table_query.php
+++ b/db_multi_table_query.php
@@ -26,10 +26,10 @@ $container = Container::getDefaultContainer();
 $container->set(Response::class, Response::getInstance());
 
 /** @var Response $response */
-$response = $container->get(Response::class);
+$response = $containerBuilder->get(Response::class);
 
 /** @var DatabaseInterface $dbi */
-$dbi = $container->get(DatabaseInterface::class);
+$dbi = $containerBuilder->get(DatabaseInterface::class);
 
 /** @var Definition $definition */
 $definition = $containerBuilder->getDefinition(MultiTableQueryController::class);
diff --git a/db_operations.php b/db_operations.php
index 1dee2a7614..7b8e19fcad 100644
--- a/db_operations.php
+++ b/db_operations.php
@@ -34,14 +34,11 @@ global $cfg, $db, $server, $url_query;
 
 require_once ROOT_PATH . 'libraries/common.inc.php';
 
-$container = Container::getDefaultContainer();
-$container->set(Response::class, Response::getInstance());
-
 /** @var Response $response */
-$response = $container->get(Response::class);
+$response = $containerBuilder->get(Response::class);
 
 /** @var DatabaseInterface $dbi */
-$dbi = $container->get(DatabaseInterface::class);
+$dbi = $containerBuilder->get(DatabaseInterface::class);
 
 $checkUserPrivileges = new CheckUserPrivileges($dbi);
 $checkUserPrivileges->getPrivileges();
diff --git a/db_qbe.php b/db_qbe.php
index 65a85fa179..3337c2bce9 100644
--- a/db_qbe.php
+++ b/db_qbe.php
@@ -27,14 +27,11 @@ global $db, $pmaThemeImage, $url_query;
 
 require_once ROOT_PATH . 'libraries/common.inc.php';
 
-$container = Container::getDefaultContainer();
-$container->set(Response::class, Response::getInstance());
-
 /** @var Response $response */
-$response = $container->get(Response::class);
+$response = $containerBuilder->get(Response::class);
 
 /** @var DatabaseInterface $dbi */
-$dbi = $container->get(DatabaseInterface::class);
+$dbi = $containerBuilder->get(DatabaseInterface::class);
 
 /** @var Relation $relation */
 $relation = $containerBuilder->get('relation');
diff --git a/db_routines.php b/db_routines.php
index be2dbd744a..569f5000f2 100644
--- a/db_routines.php
+++ b/db_routines.php
@@ -28,10 +28,10 @@ $container = Container::getDefaultContainer();
 $container->set(Response::class, Response::getInstance());
 
 /** @var Response $response */
-$response = $container->get(Response::class);
+$response = $containerBuilder->get(Response::class);
 
 /** @var DatabaseInterface $dbi */
-$dbi = $container->get(DatabaseInterface::class);
+$dbi = $containerBuilder->get(DatabaseInterface::class);
 
 $checkUserPrivileges = new CheckUserPrivileges($dbi);
 $checkUserPrivileges->getPrivileges();
diff --git a/db_search.php b/db_search.php
index b1de5576e8..eee69ac0d9 100644
--- a/db_search.php
+++ b/db_search.php
@@ -24,14 +24,11 @@ global $db, $url_query;
 
 require_once ROOT_PATH . 'libraries/common.inc.php';
 
-$container = Container::getDefaultContainer();
-$container->set(Response::class, Response::getInstance());
-
 /** @var Response $response */
-$response = $container->get(Response::class);
+$response = $containerBuilder->get(Response::class);
 
 /** @var DatabaseInterface $dbi */
-$dbi = $container->get(DatabaseInterface::class);
+$dbi = $containerBuilder->get(DatabaseInterface::class);
 
 /** @var Template $template */
 $template = $containerBuilder->get('template');
diff --git a/db_sql.php b/db_sql.php
index af286d1f3d..3e18e56fe5 100644
--- a/db_sql.php
+++ b/db_sql.php
@@ -26,10 +26,10 @@ $container = Container::getDefaultContainer();
 $container->set(Response::class, Response::getInstance());
 
 /** @var Response $response */
-$response = $container->get(Response::class);
+$response = $containerBuilder->get(Response::class);
 
 /** @var DatabaseInterface $dbi */
-$dbi = $container->get(DatabaseInterface::class);
+$dbi = $containerBuilder->get(DatabaseInterface::class);
 
 /** @var Definition $definition */
 $definition = $containerBuilder->getDefinition(SqlController::class);
diff --git a/db_sql_autocomplete.php b/db_sql_autocomplete.php
index bac726590c..42d0b67aeb 100644
--- a/db_sql_autocomplete.php
+++ b/db_sql_autocomplete.php
@@ -17,14 +17,11 @@ if (! defined('ROOT_PATH')) {
 
 require_once ROOT_PATH . 'libraries/common.inc.php';
 
-$container = Container::getDefaultContainer();
-$container->set(Response::class, Response::getInstance());
-
 /** @var Response $response */
-$response = $container->get(Response::class);
+$response = $containerBuilder->get(Response::class);
 
 /** @var DatabaseInterface $dbi */
-$dbi = $container->get(DatabaseInterface::class);
+$dbi = $containerBuilder->get(DatabaseInterface::class);
 
 if ($GLOBALS['cfg']['EnableAutocompleteForTablesAndColumns']) {
     $db = isset($_POST['db']) ? $_POST['db'] : $GLOBALS['db'];
diff --git a/db_structure.php b/db_structure.php
index 67af9f9f10..0316730cfc 100644
--- a/db_structure.php
+++ b/db_structure.php
@@ -24,12 +24,11 @@ global $db;
 require_once ROOT_PATH . 'libraries/common.inc.php';
 require_once ROOT_PATH . 'libraries/db_common.inc.php';
 
-$container = Container::getDefaultContainer();
-$container->set(Response::class, Response::getInstance());
-$container->alias('response', Response::class);
+/** @var Response $response */
+$response = $containerBuilder->get(Response::class);
 
 /** @var DatabaseInterface $dbi */
-$dbi = $container->get(DatabaseInterface::class);
+$dbi = $containerBuilder->get(DatabaseInterface::class);
 
 /* Define dependencies for the concerned controller */
 $dependency_definitions = [
@@ -49,9 +48,6 @@ array_map(
 /** @var StructureController $controller */
 $controller = $containerBuilder->get(StructureController::class);
 
-/** @var Response $response */
-$response = $container->get(Response::class);
-
 if ($response->isAjax() && ! empty($_REQUEST['favorite_table'])) {
     $json = $controller->addRemoveFavoriteTablesAction([
         'favorite_table' => $_REQUEST['favorite_table'],
diff --git a/db_triggers.php b/db_triggers.php
index eb3453ebf9..455177bfae 100644
--- a/db_triggers.php
+++ b/db_triggers.php
@@ -27,10 +27,10 @@ $container = Container::getDefaultContainer();
 $container->set(Response::class, Response::getInstance());
 
 /** @var Response $response */
-$response = $container->get(Response::class);
+$response = $containerBuilder->get(Response::class);
 
 /** @var DatabaseInterface $dbi */
-$dbi = $container->get(DatabaseInterface::class);
+$dbi = $containerBuilder->get(DatabaseInterface::class);
 
 $_PMA_RTE = 'TRI';
 
diff --git a/export.php b/export.php
index c620cd83fe..1275e97d55 100644
--- a/export.php
+++ b/export.php
@@ -31,14 +31,11 @@ global $db, $sql_query;
 
 include_once ROOT_PATH . 'libraries/common.inc.php';
 
-$container = Container::getDefaultContainer();
-$container->set(Response::class, Response::getInstance());
-
 /** @var Response $response */
-$response = $container->get(Response::class);
+$response = $containerBuilder->get(Response::class);
 
 /** @var DatabaseInterface $dbi */
-$dbi = $container->get(DatabaseInterface::class);
+$dbi = $containerBuilder->get(DatabaseInterface::class);
 
 $header = $response->getHeader();
 $scripts = $header->getScripts();
diff --git a/import.php b/import.php
index b5633e8cd8..2a6ac70664 100644
--- a/import.php
+++ b/import.php
@@ -35,14 +35,11 @@ global $db, $pmaThemeImage, $table;
 
 require_once ROOT_PATH . 'libraries/common.inc.php';
 
-$container = Container::getDefaultContainer();
-$container->set(Response::class, Response::getInstance());
-
 /** @var Response $response */
-$response = $container->get(Response::class);
+$response = $containerBuilder->get(Response::class);
 
 /** @var DatabaseInterface $dbi */
-$dbi = $container->get(DatabaseInterface::class);
+$dbi = $containerBuilder->get(DatabaseInterface::class);
 
 /** @var import $import */
 $import = $containerBuilder->get('import');
diff --git a/index.php b/index.php
index de16b88573..a21a7d9f3a 100644
--- a/index.php
+++ b/index.php
@@ -60,14 +60,11 @@ if (! empty($_REQUEST['target'])
     exit;
 }
 
-$container = Container::getDefaultContainer();
-$container->set(Response::class, Response::getInstance());
-
 /** @var Response $response */
-$response = $container->get(Response::class);
+$response = $containerBuilder->get(Response::class);
 
 /** @var DatabaseInterface $dbi */
-$dbi = $container->get(DatabaseInterface::class);
+$dbi = $containerBuilder->get(DatabaseInterface::class);
 
 /** @var HomeController $controller */
 $controller = $containerBuilder->get(HomeController::class);
diff --git a/libraries/tbl_columns_definition_form.inc.php b/libraries/tbl_columns_definition_form.inc.php
index 5565c60d7c..25e6f98c6f 100644
--- a/libraries/tbl_columns_definition_form.inc.php
+++ b/libraries/tbl_columns_definition_form.inc.php
@@ -8,6 +8,7 @@
  */
 declare(strict_types=1);
 
+use PhpMyAdmin\DatabaseInterface;
 use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Partition;
 use PhpMyAdmin\Relation;
@@ -106,8 +107,8 @@ $comments_map = $relation->getComments($db, $table);
 
 $move_columns = [];
 if (isset($fields_meta)) {
-    /** @var PhpMyAdmin\DatabaseInterface $dbi */
-    $dbi = Container::getDefaultContainer()->get('dbi');
+    /** @var DatabaseInterface $dbi */
+    $dbi = $containerBuilder->get('dbi');
     $move_columns = $dbi->getTable($db, $table)->getColumnsMeta();
 }
 
diff --git a/navigation.php b/navigation.php
index 9a94ba7329..d57d947f0c 100644
--- a/navigation.php
+++ b/navigation.php
@@ -23,14 +23,11 @@ if (! defined('ROOT_PATH')) {
 
 require_once ROOT_PATH . 'libraries/common.inc.php';
 
-$container = Container::getDefaultContainer();
-$container->set(Response::class, Response::getInstance());
-
 /** @var Response $response */
-$response = $container->get(Response::class);
+$response = $containerBuilder->get(Response::class);
 
 /** @var DatabaseInterface $dbi */
-$dbi = $container->get(DatabaseInterface::class);
+$dbi = $containerBuilder->get(DatabaseInterface::class);
 
 /** @var Navigation $navigation */
 $navigation = $containerBuilder->get('navigation');
diff --git a/normalization.php b/normalization.php
index 01c9ca3f3b..c6b8c6b110 100644
--- a/normalization.php
+++ b/normalization.php
@@ -22,14 +22,11 @@ global $db, $table;
 
 require_once ROOT_PATH . 'libraries/common.inc.php';
 
-$container = Container::getDefaultContainer();
-$container->set(Response::class, Response::getInstance());
-
 /** @var Response $response */
-$response = $container->get(Response::class);
+$response = $containerBuilder->get(Response::class);
 
 /** @var DatabaseInterface $dbi */
-$dbi = $container->get(DatabaseInterface::class);
+$dbi = $containerBuilder->get(DatabaseInterface::class);
 
 /** @var Normalization $normalization */
 $normalization = $containerBuilder->get('normalization');
diff --git a/schema_export.php b/schema_export.php
index 62cd13135a..c928bed85a 100644
--- a/schema_export.php
+++ b/schema_export.php
@@ -19,11 +19,6 @@ if (! defined('ROOT_PATH')) {
 
 require_once ROOT_PATH . 'libraries/common.inc.php';
 
-$container = Container::getDefaultContainer();
-
-/** @var DatabaseInterface $dbi */
-$dbi = $container->get(DatabaseInterface::class);
-
 /**
  * get all variables needed for exporting relational schema
  * in $cfgRelation
diff --git a/server_binlog.php b/server_binlog.php
index 7721aa4781..c76891acab 100644
--- a/server_binlog.php
+++ b/server_binlog.php
@@ -17,15 +17,11 @@ if (! defined('ROOT_PATH')) {
 
 require_once ROOT_PATH . 'libraries/common.inc.php';
 
-$container = Container::getDefaultContainer();
-$container->set(Response::class, Response::getInstance());
-$container->alias('response', Response::class);
-
 /** @var BinlogController $controller */
 $controller = $containerBuilder->get(BinlogController::class);
 
 /** @var Response $response */
-$response = $container->get('response');
+$response = $containerBuilder->get(Response::class);
 
 $response->addHTML($controller->indexAction([
     'log' => $_POST['log'] ?? null,
diff --git a/server_collations.php b/server_collations.php
index 96f8b1608e..ccc61467d3 100644
--- a/server_collations.php
+++ b/server_collations.php
@@ -17,12 +17,9 @@ if (! defined('ROOT_PATH')) {
 
 require_once ROOT_PATH . 'libraries/common.inc.php';
 
-$container = Container::getDefaultContainer();
-$container->set(Response::class, Response::getInstance());
-$container->alias('response', Response::class);
-
 /** @var CollationsController $controller */
 $controller = $containerBuilder->get(CollationsController::class);
-$response = $container->get('response');
 
+/** @var Response $response */
+$response = $containerBuilder->get(Response::class);
 $response->addHTML($controller->indexAction());
diff --git a/server_databases.php b/server_databases.php
index f56327d02e..0d60a20429 100644
--- a/server_databases.php
+++ b/server_databases.php
@@ -20,15 +20,12 @@ if (! defined('ROOT_PATH')) {
 
 require_once ROOT_PATH . 'libraries/common.inc.php';
 
-$response = $containerBuilder->get('response', ContainerInterface::NULL_ON_INVALID_REFERENCE) ?? Response::getInstance();
-
-$container = Container::getDefaultContainer();
-$container->set(Response::class, $response);
-$container->alias('response', Response::class);
-
 /** @var DatabasesController $controller */
 $controller = $containerBuilder->get(DatabasesController::class);
 
+/** @var Response $response */
+$response = $containerBuilder->get(Response::class);
+
 /** @var DatabaseInterface $dbi */
 $dbi = $containerBuilder->get(DatabaseInterface::class);
 
diff --git a/server_engines.php b/server_engines.php
index 887eb5cfca..18bc179e82 100644
--- a/server_engines.php
+++ b/server_engines.php
@@ -17,15 +17,11 @@ if (! defined('ROOT_PATH')) {
 
 require_once ROOT_PATH . 'libraries/common.inc.php';
 
-$container = Container::getDefaultContainer();
-$container->set(Response::class, Response::getInstance());
-$container->alias('response', Response::class);
-
 /** @var EnginesController $controller */
 $controller = $containerBuilder->get(EnginesController::class);
 
 /** @var Response $response */
-$response = $container->get(Response::class);
+$response = $containerBuilder->get(Response::class);
 
 if (isset($_GET['engine']) && $_GET['engine'] !== '') {
     $response->addHTML($controller->show([
diff --git a/server_plugins.php b/server_plugins.php
index f07729d756..72b773c8b1 100644
--- a/server_plugins.php
+++ b/server_plugins.php
@@ -17,14 +17,9 @@ if (! defined('ROOT_PATH')) {
 
 require_once ROOT_PATH . 'libraries/common.inc.php';
 
-$container = Container::getDefaultContainer();
-$container->set(Response::class, Response::getInstance());
-$container->alias('response', Response::class);
-
 /** @var PluginsController $controller */
 $controller = $containerBuilder->get(PluginsController::class);
 
 /** @var Response $response */
-$response = $container->get(Response::class);
-
+$response = $containerBuilder->get(Response::class);
 $response->addHTML($controller->index());
diff --git a/server_privileges.php b/server_privileges.php
index aa3c0446d1..7001abf483 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -27,10 +27,11 @@ global $db, $pmaThemeImage, $text_dir, $url_query;
 
 require_once ROOT_PATH . 'libraries/common.inc.php';
 
-$container = Container::getDefaultContainer();
+/** @var Response $response */
+$response = $containerBuilder->get(Response::class);
 
 /** @var DatabaseInterface $dbi */
-$dbi = $container->get(DatabaseInterface::class);
+$dbi = $containerBuilder->get(DatabaseInterface::class);
 
 $checkUserPrivileges = new CheckUserPrivileges($dbi);
 $checkUserPrivileges->getPrivileges();
@@ -42,7 +43,6 @@ $cfgRelation = $relation->getRelationsParam();
 /**
  * Does the common work
  */
-$response = Response::getInstance();
 $header   = $response->getHeader();
 $scripts  = $header->getScripts();
 $scripts->addFile('server/privileges.js');
diff --git a/server_replication.php b/server_replication.php
index f5a6c0388d..419eb2091c 100644
--- a/server_replication.php
+++ b/server_replication.php
@@ -21,14 +21,11 @@ require_once ROOT_PATH . 'libraries/common.inc.php';
 require_once ROOT_PATH . 'libraries/server_common.inc.php';
 require_once ROOT_PATH . 'libraries/replication.inc.php';
 
-$container = Container::getDefaultContainer();
-$container->set(Response::class, Response::getInstance());
-
 /** @var Response $response */
-$response = $container->get(Response::class);
+$response = $containerBuilder->get(Response::class);
 
 /** @var DatabaseInterface $dbi */
-$dbi = $container->get(DatabaseInterface::class);
+$dbi = $containerBuilder->get(DatabaseInterface::class);
 
 /** @var ReplicationController $controller */
 $controller = $containerBuilder->get(ReplicationController::class);
diff --git a/server_sql.php b/server_sql.php
index bdb594b146..6cb7cde515 100644
--- a/server_sql.php
+++ b/server_sql.php
@@ -19,14 +19,11 @@ if (! defined('ROOT_PATH')) {
 
 require_once ROOT_PATH . 'libraries/common.inc.php';
 
-$container = Container::getDefaultContainer();
-$container->set(Response::class, Response::getInstance());
-
 /** @var Response $response */
-$response = $container->get(Response::class);
+$response = $containerBuilder->get(Response::class);
 
 /** @var DatabaseInterface $dbi */
-$dbi = $container->get(DatabaseInterface::class);
+$dbi = $containerBuilder->get(DatabaseInterface::class);
 
 /** @var SqlController $controller */
 $controller = $containerBuilder->get(SqlController::class);
diff --git a/server_status.php b/server_status.php
index ac1b32ab8c..e90af13bef 100644
--- a/server_status.php
+++ b/server_status.php
@@ -21,14 +21,11 @@ require_once ROOT_PATH . 'libraries/common.inc.php';
 require_once ROOT_PATH . 'libraries/server_common.inc.php';
 require_once ROOT_PATH . 'libraries/replication.inc.php';
 
-$container = Container::getDefaultContainer();
-$container->set(Response::class, Response::getInstance());
-
 /** @var Response $response */
-$response = $container->get(Response::class);
+$response = $containerBuilder->get(Response::class);
 
 /** @var DatabaseInterface $dbi */
-$dbi = $container->get(DatabaseInterface::class);
+$dbi = $containerBuilder->get(DatabaseInterface::class);
 
 /** @var StatusController $controller */
 $controller = $containerBuilder->get(StatusController::class);
diff --git a/server_status_advisor.php b/server_status_advisor.php
index 522e1bda4d..f29fda63b5 100644
--- a/server_status_advisor.php
+++ b/server_status_advisor.php
@@ -20,14 +20,11 @@ if (! defined('ROOT_PATH')) {
 require_once ROOT_PATH . 'libraries/common.inc.php';
 require_once ROOT_PATH . 'libraries/replication.inc.php';
 
-$container = Container::getDefaultContainer();
-$container->set(Response::class, Response::getInstance());
-
 /** @var Response $response */
-$response = $container->get(Response::class);
+$response = $containerBuilder->get(Response::class);
 
 /** @var DatabaseInterface $dbi */
-$dbi = $container->get(DatabaseInterface::class);
+$dbi = $containerBuilder->get(DatabaseInterface::class);
 
 $scripts = $response->getHeader()->getScripts();
 $scripts->addFile('server/status/advisor.js');
diff --git a/server_status_monitor.php b/server_status_monitor.php
index d84aaec2cc..28fe96a21d 100644
--- a/server_status_monitor.php
+++ b/server_status_monitor.php
@@ -22,14 +22,11 @@ require_once ROOT_PATH . 'libraries/common.inc.php';
 require_once ROOT_PATH . 'libraries/server_common.inc.php';
 require_once ROOT_PATH . 'libraries/replication.inc.php';
 
-$container = Container::getDefaultContainer();
-$container->set(Response::class, Response::getInstance());
-
 /** @var Response $response */
-$response = $container->get(Response::class);
+$response = $containerBuilder->get(Response::class);
 
 /** @var DatabaseInterface $dbi */
-$dbi = $container->get(DatabaseInterface::class);
+$dbi = $containerBuilder->get(DatabaseInterface::class);
 
 /** @var MonitorController $controller */
 $controller = $containerBuilder->get(MonitorController::class);
diff --git a/server_status_processes.php b/server_status_processes.php
index fd88fe1d60..bc02251d11 100644
--- a/server_status_processes.php
+++ b/server_status_processes.php
@@ -21,14 +21,11 @@ require_once ROOT_PATH . 'libraries/common.inc.php';
 require_once ROOT_PATH . 'libraries/server_common.inc.php';
 require_once ROOT_PATH . 'libraries/replication.inc.php';
 
-$container = Container::getDefaultContainer();
-$container->set(Response::class, Response::getInstance());
-
 /** @var Response $response */
-$response = $container->get(Response::class);
+$response = $containerBuilder->get(Response::class);
 
 /** @var DatabaseInterface $dbi */
-$dbi = $container->get(DatabaseInterface::class);
+$dbi = $containerBuilder->get(DatabaseInterface::class);
 
 /** @var ProcessesController $controller */
 $controller = $containerBuilder->get(ProcessesController::class);
diff --git a/server_status_queries.php b/server_status_queries.php
index d3c9baa4a4..c15b57a9fd 100644
--- a/server_status_queries.php
+++ b/server_status_queries.php
@@ -21,14 +21,11 @@ require_once ROOT_PATH . 'libraries/common.inc.php';
 require_once ROOT_PATH . 'libraries/server_common.inc.php';
 require_once ROOT_PATH . 'libraries/replication.inc.php';
 
-$container = Container::getDefaultContainer();
-$container->set(Response::class, Response::getInstance());
-
 /** @var Response $response */
-$response = $container->get(Response::class);
+$response = $containerBuilder->get(Response::class);
 
 /** @var DatabaseInterface $dbi */
-$dbi = $container->get(DatabaseInterface::class);
+$dbi = $containerBuilder->get(DatabaseInterface::class);
 
 /** @var QueriesController $controller */
 $controller = $containerBuilder->get(QueriesController::class);
diff --git a/server_status_variables.php b/server_status_variables.php
index 92af9724f9..6d54a2b3c7 100644
--- a/server_status_variables.php
+++ b/server_status_variables.php
@@ -21,14 +21,11 @@ require_once ROOT_PATH . 'libraries/common.inc.php';
 require_once ROOT_PATH . 'libraries/server_common.inc.php';
 require_once ROOT_PATH . 'libraries/replication.inc.php';
 
-$container = Container::getDefaultContainer();
-$container->set(Response::class, Response::getInstance());
-
 /** @var Response $response */
-$response = $container->get(Response::class);
+$response = $containerBuilder->get(Response::class);
 
 /** @var DatabaseInterface $dbi */
-$dbi = $container->get(DatabaseInterface::class);
+$dbi = $containerBuilder->get(DatabaseInterface::class);
 
 /** @var VariablesController $controller */
 $controller = $containerBuilder->get(VariablesController::class);
diff --git a/server_user_groups.php b/server_user_groups.php
index 5839a52ba9..ffe962ee3b 100644
--- a/server_user_groups.php
+++ b/server_user_groups.php
@@ -20,14 +20,11 @@ if (! defined('ROOT_PATH')) {
 
 require_once ROOT_PATH . 'libraries/common.inc.php';
 
-$container = Container::getDefaultContainer();
-$container->set(Response::class, Response::getInstance());
-
 /** @var Response $response */
-$response = $container->get(Response::class);
+$response = $containerBuilder->get(Response::class);
 
 /** @var DatabaseInterface $dbi */
-$dbi = $container->get(DatabaseInterface::class);
+$dbi = $containerBuilder->get(DatabaseInterface::class);
 
 /** @var Relation $relation */
 $relation = $containerBuilder->get('relation');
diff --git a/server_variables.php b/server_variables.php
index 516f122143..5fce620480 100644
--- a/server_variables.php
+++ b/server_variables.php
@@ -17,15 +17,11 @@ if (! defined('ROOT_PATH')) {
 
 require_once ROOT_PATH . 'libraries/common.inc.php';
 
-$container = Container::getDefaultContainer();
-$container->set(Response::class, Response::getInstance());
-$container->alias('response', Response::class);
-
 /** @var VariablesController $controller */
 $controller = $containerBuilder->get(VariablesController::class);
 
 /** @var Response $response */
-$response = $container->get(Response::class);
+$response = $containerBuilder->get(Response::class);
 
 if ($response->isAjax()
     && isset($_GET['type']) && $_GET['type'] === 'getval') {
diff --git a/services.yml b/services.yml
index 5df784c3a7..3f25a068ff 100644
--- a/services.yml
+++ b/services.yml
@@ -71,6 +71,9 @@ services:
       replication: '@replication'
       template: '@template'
 
+  response:
+    factory: 'PhpMyAdmin\Response::getInstance'
+
   sql_query_form:
     class: 'PhpMyAdmin\SqlQueryForm'
 
@@ -93,3 +96,9 @@ services:
 
   transformations:
     class: 'PhpMyAdmin\Transformations'
+
+  #Aliases
+
+  PhpMyAdmin\Response: '@response'
+
+  PhpMyAdmin\DatabaseInterface: '@dbi'
\ No newline at end of file
diff --git a/tbl_sql.php b/tbl_sql.php
index 88f00eafe3..45073968f7 100644
--- a/tbl_sql.php
+++ b/tbl_sql.php
@@ -26,10 +26,10 @@ $container = Container::getDefaultContainer();
 $container->set(Response::class, Response::getInstance());
 
 /** @var Response $response */
-$response = $container->get(Response::class);
+$response = $containerBuilder->get(Response::class);
 
 /** @var DatabaseInterface $dbi */
-$dbi = $container->get(DatabaseInterface::class);
+$dbi = $containerBuilder->get(DatabaseInterface::class);
 
 /* Define dependencies for the concerned controller */
 $dependency_definitions = [
diff --git a/transformation_wrapper.php b/transformation_wrapper.php
index 27bb0b9e0c..904071ad98 100644
--- a/transformation_wrapper.php
+++ b/transformation_wrapper.php
@@ -24,14 +24,11 @@ global $db, $table;
 
 require_once ROOT_PATH . 'libraries/common.inc.php';
 
-$container = Container::getDefaultContainer();
-$container->set(Response::class, Response::getInstance());
-
 /** @var Response $response */
-$response = $container->get(Response::class);
+$response = $containerBuilder->get(Response::class);
 
 /** @var DatabaseInterface $dbi */
-$dbi = $container->get(DatabaseInterface::class);
+$dbi = $containerBuilder->get(DatabaseInterface::class);
 
 /** @var Transformations $transformations */
 $transformations = $containerBuilder->get('transformations');
diff --git a/view_operations.php b/view_operations.php
index 719d8540d6..a752542b44 100644
--- a/view_operations.php
+++ b/view_operations.php
@@ -25,14 +25,11 @@ global $sql_query, $url_query;
 
 require_once ROOT_PATH . 'libraries/common.inc.php';
 
-$container = Container::getDefaultContainer();
-$container->set(Response::class, Response::getInstance());
-
 /** @var Response $response */
-$response = $container->get(Response::class);
+$response = $containerBuilder->get(Response::class);
 
 /** @var DatabaseInterface $dbi */
-$dbi = $container->get(DatabaseInterface::class);
+$dbi = $containerBuilder->get(DatabaseInterface::class);
 
 $pma_table = new Table($GLOBALS['table'], $GLOBALS['db']);