diff --git a/ajax.php b/ajax.php
index d0a4516458..9e02080b39 100644
--- a/ajax.php
+++ b/ajax.php
@@ -10,7 +10,6 @@ declare(strict_types=1);
 use PhpMyAdmin\Controllers\AjaxController;
 use PhpMyAdmin\Core;
 use PhpMyAdmin\DatabaseInterface;
-use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Response;
 use PhpMyAdmin\Util;
 
@@ -22,16 +21,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..dea79c4e56 100644
--- a/browse_foreigners.php
+++ b/browse_foreigners.php
@@ -10,7 +10,6 @@ declare(strict_types=1);
 use PhpMyAdmin\BrowseForeigners;
 use PhpMyAdmin\Controllers\BrowseForeignersController;
 use PhpMyAdmin\DatabaseInterface;
-use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Response;
 use PhpMyAdmin\Template;
 use PhpMyAdmin\Util;
@@ -23,14 +22,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..245591735e 100644
--- a/chk_rel.php
+++ b/chk_rel.php
@@ -8,7 +8,6 @@
 declare(strict_types=1);
 
 use PhpMyAdmin\DatabaseInterface;
-use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Relation;
 use PhpMyAdmin\Response;
 
@@ -18,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);
 
 /** @var Relation $relation */
 $relation = $containerBuilder->get('relation');
diff --git a/db_central_columns.php b/db_central_columns.php
index ce9965f93e..729b608d93 100644
--- a/db_central_columns.php
+++ b/db_central_columns.php
@@ -14,45 +14,23 @@ if (! defined('ROOT_PATH')) {
 use PhpMyAdmin\CentralColumns;
 use PhpMyAdmin\Controllers\Database\CentralColumnsController;
 use PhpMyAdmin\Core;
-use PhpMyAdmin\DatabaseInterface;
-use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Message;
 use PhpMyAdmin\Response;
-use Symfony\Component\DependencyInjection\Definition;
-
-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);
-
-$centralColumns = new CentralColumns($dbi);
-/* Define dependencies for the concerned controller */
-$dependency_definitions = [
-    'db' => $container->get('db'),
-    'centralColumns' => $centralColumns,
-];
-
-/** @var Definition $definition */
-$definition = $containerBuilder->getDefinition(CentralColumnsController::class);
-array_map(
-    static function (string $parameterName, $value) use ($definition) {
-        $definition->replaceArgument($parameterName, $value);
-    },
-    array_keys($dependency_definitions),
-    $dependency_definitions
-);
+/** @var CentralColumns $centralColumns */
+$centralColumns = $containerBuilder->get('central_columns');
 
 /** @var CentralColumnsController $controller */
 $controller = $containerBuilder->get(CentralColumnsController::class);
 
+/** @var string $db */
+$db = $containerBuilder->getParameter('db');
+
 if (isset($_POST['edit_save'])) {
     echo $controller->editSave([
         'col_name' => $_POST['col_name'] ?? null,
diff --git a/db_datadict.php b/db_datadict.php
index 03fa55f1d8..7f0f304fd7 100644
--- a/db_datadict.php
+++ b/db_datadict.php
@@ -8,44 +8,19 @@
 declare(strict_types=1);
 
 use PhpMyAdmin\Controllers\Database\DataDictionaryController;
-use PhpMyAdmin\DatabaseInterface;
-use PhpMyAdmin\Di\Container;
-use PhpMyAdmin\Relation;
 use PhpMyAdmin\Response;
-use PhpMyAdmin\Transformations;
 use PhpMyAdmin\Util;
-use Symfony\Component\DependencyInjection\Definition;
 
 if (! defined('ROOT_PATH')) {
     define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
 }
 
-global $db;
-
 require_once ROOT_PATH . 'libraries/common.inc.php';
 
 Util::checkParameters(['db']);
 
-$container = Container::getDefaultContainer();
-$container->set(Response::class, Response::getInstance());
-
 /** @var Response $response */
-$response = $container->get(Response::class);
-
-/* Define dependencies for the concerned controller */
-$dependency_definitions = [
-    'db' => $container->get('db'),
-];
-
-/** @var Definition $definition */
-$definition = $containerBuilder->getDefinition(DataDictionaryController::class);
-array_map(
-    static function (string $parameterName, $value) use ($definition) {
-        $definition->replaceArgument($parameterName, $value);
-    },
-    array_keys($dependency_definitions),
-    $dependency_definitions
-);
+$response = $containerBuilder->get(Response::class);
 
 /** @var DataDictionaryController $controller */
 $controller = $containerBuilder->get(DataDictionaryController::class);
diff --git a/db_designer.php b/db_designer.php
index ebfaacb525..0dc2c022fb 100644
--- a/db_designer.php
+++ b/db_designer.php
@@ -10,7 +10,6 @@ declare(strict_types=1);
 use PhpMyAdmin\Database\Designer;
 use PhpMyAdmin\Database\Designer\Common;
 use PhpMyAdmin\DatabaseInterface;
-use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Response;
 
 if (! defined('ROOT_PATH')) {
@@ -21,14 +20,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..7012492e1f 100644
--- a/db_events.php
+++ b/db_events.php
@@ -9,38 +9,33 @@ declare(strict_types=1);
 
 use PhpMyAdmin\Controllers\Database\EventsController;
 use PhpMyAdmin\DatabaseInterface;
-use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Response;
 use PhpMyAdmin\Url;
 use PhpMyAdmin\Util;
-use Symfony\Component\DependencyInjection\Definition;
 
 if (! defined('ROOT_PATH')) {
     define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
 }
 
-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);
 
 $_PMA_RTE = 'EVN';
 
-/** @var Definition $definition */
-$definition = $containerBuilder->getDefinition(EventsController::class);
-$definition->replaceArgument('db', $container->get('db'));
-
 /** @var EventsController $controller */
 $controller = $containerBuilder->get(EventsController::class);
 
+/** @var string $db */
+$db = $containerBuilder->getParameter('db');
+
+/** @var string $table */
+$table = $containerBuilder->getParameter('table');
+
 if (! $response->isAjax()) {
     /**
      * Displays the header and tabs
diff --git a/db_export.php b/db_export.php
index aec0b9a53d..a732dbeb8d 100644
--- a/db_export.php
+++ b/db_export.php
@@ -9,7 +9,6 @@ declare(strict_types=1);
 
 use PhpMyAdmin\Config\PageSettings;
 use PhpMyAdmin\DatabaseInterface;
-use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Display\Export as DisplayExport;
 use PhpMyAdmin\Export;
 use PhpMyAdmin\Message;
@@ -24,14 +23,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..c624e85b1e 100644
--- a/db_multi_table_query.php
+++ b/db_multi_table_query.php
@@ -9,31 +9,20 @@ declare(strict_types=1);
 
 use PhpMyAdmin\Controllers\Database\MultiTableQueryController;
 use PhpMyAdmin\DatabaseInterface;
-use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Response;
 use PhpMyAdmin\Template;
-use Symfony\Component\DependencyInjection\Definition;
 
 if (! defined('ROOT_PATH')) {
     define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
 }
 
-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);
-
-/** @var Definition $definition */
-$definition = $containerBuilder->getDefinition(MultiTableQueryController::class);
-$definition->replaceArgument('db', $container->get('db'));
+$dbi = $containerBuilder->get(DatabaseInterface::class);
 
 /** @var MultiTableQueryController $controller */
 $controller = $containerBuilder->get(MultiTableQueryController::class);
diff --git a/db_operations.php b/db_operations.php
index 1dee2a7614..c31418cb7b 100644
--- a/db_operations.php
+++ b/db_operations.php
@@ -15,7 +15,6 @@ declare(strict_types=1);
 
 use PhpMyAdmin\CheckUserPrivileges;
 use PhpMyAdmin\DatabaseInterface;
-use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Display\CreateTable;
 use PhpMyAdmin\Message;
 use PhpMyAdmin\Operations;
@@ -34,14 +33,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..0ebae09ec3 100644
--- a/db_qbe.php
+++ b/db_qbe.php
@@ -9,7 +9,6 @@ declare(strict_types=1);
 
 use PhpMyAdmin\Database\Qbe;
 use PhpMyAdmin\DatabaseInterface;
-use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Message;
 use PhpMyAdmin\Relation;
 use PhpMyAdmin\Response;
@@ -27,14 +26,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..b344d5e29e 100644
--- a/db_routines.php
+++ b/db_routines.php
@@ -10,38 +10,34 @@ declare(strict_types=1);
 use PhpMyAdmin\CheckUserPrivileges;
 use PhpMyAdmin\Controllers\Database\RoutinesController;
 use PhpMyAdmin\DatabaseInterface;
-use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Response;
 use PhpMyAdmin\Url;
 use PhpMyAdmin\Util;
-use Symfony\Component\DependencyInjection\Definition;
 
 if (! defined('ROOT_PATH')) {
     define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
 }
 
-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);
 
-$checkUserPrivileges = new CheckUserPrivileges($dbi);
+/** @var string $db */
+$db = $containerBuilder->getParameter('db');
+
+/** @var string $table */
+$table = $containerBuilder->getParameter('table');
+
+/** @var CheckUserPrivileges $checkUserPrivileges */
+$checkUserPrivileges = $containerBuilder->get('check_user_privileges');
 $checkUserPrivileges->getPrivileges();
 
 $_PMA_RTE = 'RTN';
 
-/** @var Definition $definition */
-$definition = $containerBuilder->getDefinition(RoutinesController::class);
-$definition->replaceArgument('db', $container->get('db'));
-
 /** @var RoutinesController $controller */
 $controller = $containerBuilder->get(RoutinesController::class);
 
diff --git a/db_search.php b/db_search.php
index b1de5576e8..44cc1818ac 100644
--- a/db_search.php
+++ b/db_search.php
@@ -11,7 +11,6 @@ declare(strict_types=1);
 
 use PhpMyAdmin\Database\Search;
 use PhpMyAdmin\DatabaseInterface;
-use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Response;
 use PhpMyAdmin\Template;
 use PhpMyAdmin\Util;
@@ -24,14 +23,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..84ce7b5be8 100644
--- a/db_sql.php
+++ b/db_sql.php
@@ -12,28 +12,21 @@ use PhpMyAdmin\DatabaseInterface;
 use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Response;
 use PhpMyAdmin\SqlQueryForm;
-use Symfony\Component\DependencyInjection\Definition;
 
 if (! defined('ROOT_PATH')) {
     define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
 }
 
-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);
-
-/** @var Definition $definition */
-$definition = $containerBuilder->getDefinition(SqlController::class);
-$definition->replaceArgument('db', $container->get('db'));
+$dbi = $containerBuilder->get(DatabaseInterface::class);
 
 /** @var SqlController $controller */
 $controller = $containerBuilder->get(SqlController::class);
diff --git a/db_sql_autocomplete.php b/db_sql_autocomplete.php
index bac726590c..86e94e1b30 100644
--- a/db_sql_autocomplete.php
+++ b/db_sql_autocomplete.php
@@ -8,7 +8,6 @@
 declare(strict_types=1);
 
 use PhpMyAdmin\DatabaseInterface;
-use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Response;
 
 if (! defined('ROOT_PATH')) {
@@ -17,14 +16,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..41dd1c47d2 100644
--- a/db_structure.php
+++ b/db_structure.php
@@ -9,49 +9,24 @@ declare(strict_types=1);
 
 use PhpMyAdmin\Controllers\Database\StructureController;
 use PhpMyAdmin\DatabaseInterface;
-use PhpMyAdmin\Di\Container;
-use PhpMyAdmin\Relation;
-use PhpMyAdmin\Replication;
 use PhpMyAdmin\Response;
-use Symfony\Component\DependencyInjection\Definition;
 
 if (! defined('ROOT_PATH')) {
     define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
 }
 
-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);
-
-/* Define dependencies for the concerned controller */
-$dependency_definitions = [
-    'db' => $db,
-];
-
-/** @var Definition $definition */
-$definition = $containerBuilder->getDefinition(StructureController::class);
-array_map(
-    static function (string $parameterName, $value) use ($definition) {
-        $definition->replaceArgument($parameterName, $value);
-    },
-    array_keys($dependency_definitions),
-    $dependency_definitions
-);
+$dbi = $containerBuilder->get(DatabaseInterface::class);
 
 /** @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..3cf36db247 100644
--- a/db_triggers.php
+++ b/db_triggers.php
@@ -9,38 +9,33 @@ declare(strict_types=1);
 
 use PhpMyAdmin\Controllers\Database\TriggersController;
 use PhpMyAdmin\DatabaseInterface;
-use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Response;
 use PhpMyAdmin\Url;
 use PhpMyAdmin\Util;
-use Symfony\Component\DependencyInjection\Definition;
 
 if (! defined('ROOT_PATH')) {
     define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
 }
 
-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);
 
 $_PMA_RTE = 'TRI';
 
-/** @var Definition $definition */
-$definition = $containerBuilder->getDefinition(TriggersController::class);
-$definition->replaceArgument('db', $container->get('db'));
-
 /** @var TriggersController $controller */
 $controller = $containerBuilder->get(TriggersController::class);
 
+/** @var string $db */
+$db = $containerBuilder->getParameter('db');
+
+/** @var string $table */
+$table = $containerBuilder->getParameter('table');
+
 if (! $response->isAjax()) {
     /**
      * Displays the header and tabs
diff --git a/export.php b/export.php
index c620cd83fe..c521e233c3 100644
--- a/export.php
+++ b/export.php
@@ -9,7 +9,6 @@ declare(strict_types=1);
 
 use PhpMyAdmin\Core;
 use PhpMyAdmin\DatabaseInterface;
-use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Encoding;
 use PhpMyAdmin\Export;
 use PhpMyAdmin\Plugins;
@@ -31,14 +30,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..11d40b7ed1 100644
--- a/index.php
+++ b/index.php
@@ -10,7 +10,6 @@ declare(strict_types=1);
 use PhpMyAdmin\Controllers\HomeController;
 use PhpMyAdmin\Core;
 use PhpMyAdmin\DatabaseInterface;
-use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Response;
 use PhpMyAdmin\Url;
 use PhpMyAdmin\Util;
@@ -60,14 +59,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/classes/Core.php b/libraries/classes/Core.php
index 618ced65d5..9588982165 100644
--- a/libraries/classes/Core.php
+++ b/libraries/classes/Core.php
@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace PhpMyAdmin;
 
+use PhpMyAdmin\Di\Migration;
 use PhpMyAdmin\Display\Error as DisplayError;
 
 /**
@@ -905,7 +906,7 @@ class Core
         foreach (array_keys($_POST) as $post_key) {
             foreach ($post_patterns as $one_post_pattern) {
                 if (preg_match($one_post_pattern, $post_key)) {
-                    $GLOBALS[$post_key] = $_POST[$post_key];
+                    Migration::getInstance()->setGlobal($post_key, $_POST[$post_key]);
                 }
             }
         }
@@ -920,13 +921,12 @@ class Core
      */
     public static function setGlobalDbOrTable(string $param): void
     {
-        $GLOBALS[$param] = '';
+        $value = '';
         if (self::isValid($_REQUEST[$param])) {
-            // can we strip tags from this?
-            // only \ and / is not allowed in db names for MySQL
-            $GLOBALS[$param] = $_REQUEST[$param];
-            $GLOBALS['url_params'][$param] = $GLOBALS[$param];
+            $value = $_REQUEST[$param];
         }
+        Migration::getInstance()->setGlobal($param, $value);
+        Migration::getInstance()->setGlobal('url_params', [$param => $value] + $GLOBALS['url_params']);
     }
 
     /**
diff --git a/libraries/classes/DatabaseInterface.php b/libraries/classes/DatabaseInterface.php
index b2553eb117..ba578ddccf 100644
--- a/libraries/classes/DatabaseInterface.php
+++ b/libraries/classes/DatabaseInterface.php
@@ -3166,10 +3166,6 @@ class DatabaseInterface
         }
         $dbi = new DatabaseInterface($extension);
 
-        $container = Container::getDefaultContainer();
-        $container->set(DatabaseInterface::class, $dbi);
-        $container->alias('dbi', DatabaseInterface::class);
-
         return $dbi;
     }
 }
diff --git a/libraries/classes/Di/Migration.php b/libraries/classes/Di/Migration.php
new file mode 100644
index 0000000000..299061065f
--- /dev/null
+++ b/libraries/classes/Di/Migration.php
@@ -0,0 +1,71 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * Migration from home-made DI to Symfony DI
+ *
+ * @package PhpMyAdmin\Di
+ */
+declare(strict_types=1);
+
+namespace PhpMyAdmin\Di;
+
+use InvalidArgumentException;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+/**
+ * Migration from home-made DI to Symfony DI
+ *
+ * @package PhpMyAdmin\Di
+ */
+class Migration
+{
+    /** @var self */
+    protected static $instance;
+
+    /** @var ContainerBuilder */
+    protected $containerBuilder;
+
+    /**
+     * Get instance of this class
+     *
+     * @param ContainerBuilder|null $containerBuilder ContainerBuilder object that should be used to store the data
+     *
+     * @return Migration
+     */
+    public static function getInstance(?ContainerBuilder $containerBuilder = null): self
+    {
+        if (null !== self::$instance) {
+            return self::$instance;
+        }
+
+        if (null === $containerBuilder) {
+            throw new InvalidArgumentException('Container builder should be sent for ' . self::class . ' creation');
+        }
+
+        return self::$instance = new self($containerBuilder);
+    }
+
+    /**
+     * Migration constructor.
+     *
+     * @param ContainerBuilder $containerBuilder ContainerBuilder object that should be used to store the data
+     */
+    protected function __construct(ContainerBuilder $containerBuilder)
+    {
+        $this->containerBuilder = $containerBuilder;
+    }
+
+    /**
+     * Get the instance of the service
+     *
+     * @param string $key   Key of data to store
+     * @param mixed  $value Data to store
+     *
+     * @return void
+     */
+    public function setGlobal(string $key, $value)
+    {
+        $GLOBALS[$key] = $value;
+        $this->containerBuilder->setParameter($key, $value);
+    }
+}
diff --git a/libraries/common.inc.php b/libraries/common.inc.php
index 984a2225c9..8a845735d6 100644
--- a/libraries/common.inc.php
+++ b/libraries/common.inc.php
@@ -35,6 +35,8 @@ declare(strict_types=1);
 use PhpMyAdmin\Config;
 use PhpMyAdmin\Core;
 use PhpMyAdmin\DatabaseInterface;
+use PhpMyAdmin\Di\Container;
+use PhpMyAdmin\Di\Migration;
 use PhpMyAdmin\ErrorHandler;
 use PhpMyAdmin\LanguageManager;
 use PhpMyAdmin\Logging;
@@ -92,6 +94,11 @@ $containerBuilder = new ContainerBuilder();
 $loader = new YamlFileLoader($containerBuilder, new FileLocator(__DIR__));
 $loader->load('../services.yml');
 $loader->load('../services_controllers.yml');
+/** @var Migration $diMigration */
+$diMigration = $containerBuilder->get('di_migration');
+
+/** @var Container $oldContainer */
+$oldContainer = Container::getDefaultContainer();
 
 /**
  * Load gettext functions.
@@ -142,17 +149,17 @@ if (! defined('PMA_NO_SESSION')) {
  * holds parameters to be passed to next page
  * @global array $GLOBALS['url_params']
  */
-$GLOBALS['url_params'] = [];
+$diMigration->setGlobal('url_params', []);
 
 /**
  * holds page that should be displayed
  * @global string $GLOBALS['goto']
  */
-$GLOBALS['goto'] = '';
+$diMigration->setGlobal('goto', '');
 // Security fix: disallow accessing serious server files via "?goto="
 if (isset($_REQUEST['goto']) && Core::checkPageValidity($_REQUEST['goto'])) {
-    $GLOBALS['goto'] = $_REQUEST['goto'];
-    $GLOBALS['url_params']['goto'] = $_REQUEST['goto'];
+    $diMigration->setGlobal('goto', $_REQUEST['goto']);
+    $diMigration->setGlobal('url_params', ['goto' => $_REQUEST['goto']]);
 } else {
     unset($_REQUEST['goto'], $_GET['goto'], $_POST['goto'], $_COOKIE['goto']);
 }
@@ -162,7 +169,7 @@ if (isset($_REQUEST['goto']) && Core::checkPageValidity($_REQUEST['goto'])) {
  * @global string $GLOBALS['back']
  */
 if (isset($_REQUEST['back']) && Core::checkPageValidity($_REQUEST['back'])) {
-    $GLOBALS['back'] = $_REQUEST['back'];
+    $diMigration->setGlobal('back', $_REQUEST['back']);
 } else {
     unset($_REQUEST['back'], $_GET['back'], $_POST['back'], $_COOKIE['back']);
 }
@@ -232,24 +239,32 @@ Core::setGlobalDbOrTable('table');
 if (isset($_REQUEST['selected_recent_table']) && Core::isValid($_REQUEST['selected_recent_table'])) {
     $recent_table = json_decode($_REQUEST['selected_recent_table'], true);
 
-    $GLOBALS['db']
-        = (array_key_exists('db', $recent_table) && is_string($recent_table['db'])) ?
-            $recent_table['db'] : '';
-    $GLOBALS['url_params']['db'] = $GLOBALS['db'];
+    $diMigration->setGlobal(
+        'db',
+        (array_key_exists('db', $recent_table) && is_string($recent_table['db'])) ? $recent_table['db'] : ''
+    );
+    $diMigration->setGlobal(
+        'url_params',
+        ['db' => $containerBuilder->getParameter('db')] + $containerBuilder->getParameter('url_params')
+    );
 
-    $GLOBALS['table']
-        = (array_key_exists('table', $recent_table) && is_string($recent_table['table'])) ?
-            $recent_table['table'] : '';
-    $GLOBALS['url_params']['table'] = $GLOBALS['table'];
+    $diMigration->setGlobal(
+        'table',
+        (array_key_exists('table', $recent_table) && is_string($recent_table['table'])) ? $recent_table['table'] : ''
+    );
+    $diMigration->setGlobal(
+        'url_params',
+        ['table' => $containerBuilder->getParameter('table')] + $containerBuilder->getParameter('url_params')
+    );
 }
 
 /**
  * SQL query to be executed
  * @global string $GLOBALS['sql_query']
  */
-$GLOBALS['sql_query'] = '';
+$diMigration->setGlobal('sql_query', '');
 if (Core::isValid($_POST['sql_query'])) {
-    $GLOBALS['sql_query'] = $_POST['sql_query'];
+    $diMigration->setGlobal('sql_query', $_POST['sql_query']);
 }
 
 //$_REQUEST['set_theme'] // checked later in this file LABEL_theme_setup
@@ -287,8 +302,8 @@ $GLOBALS['PMA_Config']->checkServers();
  * current server
  * @global integer $GLOBALS['server']
  */
-$GLOBALS['server'] = $GLOBALS['PMA_Config']->selectServer();
-$GLOBALS['url_params']['server'] = $GLOBALS['server'];
+$diMigration->setGlobal('server', $GLOBALS['PMA_Config']->selectServer());
+$diMigration->setGlobal('url_params', ['server' => $containerBuilder->getParameter('server')] + $containerBuilder->getParameter('url_params'));
 
 /**
  * BC - enable backward compatibility
@@ -318,6 +333,8 @@ if (! defined('PMA_MINIMUM_COMMON')) {
          */
         $containerBuilder->set(DatabaseInterface::class, DatabaseInterface::load());
         $containerBuilder->setAlias('dbi', DatabaseInterface::class);
+        $oldContainer->set(DatabaseInterface::class, $containerBuilder->get(DatabaseInterface::class));
+        $oldContainer->alias('dbi', DatabaseInterface::class);
 
         // get LoginCookieValidity from preferences cache
         // no generic solution for loading preferences from cache as some settings
diff --git a/libraries/tbl_columns_definition_form.inc.php b/libraries/tbl_columns_definition_form.inc.php
index 5565c60d7c..5644473313 100644
--- a/libraries/tbl_columns_definition_form.inc.php
+++ b/libraries/tbl_columns_definition_form.inc.php
@@ -8,7 +8,7 @@
  */
 declare(strict_types=1);
 
-use PhpMyAdmin\Di\Container;
+use PhpMyAdmin\DatabaseInterface;
 use PhpMyAdmin\Partition;
 use PhpMyAdmin\Relation;
 use PhpMyAdmin\Response;
@@ -106,8 +106,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..a548b9a5e4 100644
--- a/navigation.php
+++ b/navigation.php
@@ -9,12 +9,10 @@ declare(strict_types=1);
 
 use PhpMyAdmin\Config\PageSettings;
 use PhpMyAdmin\DatabaseInterface;
-use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Message;
 use PhpMyAdmin\Navigation\Navigation;
 use PhpMyAdmin\Relation;
 use PhpMyAdmin\Response;
-use PhpMyAdmin\Template;
 use PhpMyAdmin\Util;
 
 if (! defined('ROOT_PATH')) {
@@ -23,14 +21,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..a93c1176e3 100644
--- a/normalization.php
+++ b/normalization.php
@@ -9,7 +9,6 @@ declare(strict_types=1);
 
 use PhpMyAdmin\Core;
 use PhpMyAdmin\DatabaseInterface;
-use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Normalization;
 use PhpMyAdmin\Response;
 use PhpMyAdmin\Url;
@@ -22,14 +21,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..527cfeb6e8 100644
--- a/schema_export.php
+++ b/schema_export.php
@@ -7,8 +7,6 @@
  */
 declare(strict_types=1);
 
-use PhpMyAdmin\DatabaseInterface;
-use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Export;
 use PhpMyAdmin\Relation;
 use PhpMyAdmin\Util;
@@ -19,11 +17,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..35d9c719f7 100644
--- a/server_binlog.php
+++ b/server_binlog.php
@@ -8,7 +8,6 @@
 declare(strict_types=1);
 
 use PhpMyAdmin\Controllers\Server\BinlogController;
-use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Response;
 
 if (! defined('ROOT_PATH')) {
@@ -17,15 +16,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..542779fdc5 100644
--- a/server_collations.php
+++ b/server_collations.php
@@ -8,7 +8,6 @@
 declare(strict_types=1);
 
 use PhpMyAdmin\Controllers\Server\CollationsController;
-use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Response;
 
 if (! defined('ROOT_PATH')) {
@@ -17,12 +16,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..a81b278e34 100644
--- a/server_databases.php
+++ b/server_databases.php
@@ -10,9 +10,7 @@ declare(strict_types=1);
 use PhpMyAdmin\CheckUserPrivileges;
 use PhpMyAdmin\Controllers\Server\DatabasesController;
 use PhpMyAdmin\DatabaseInterface;
-use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Response;
-use Symfony\Component\DependencyInjection\ContainerInterface;
 
 if (! defined('ROOT_PATH')) {
     define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
@@ -20,15 +18,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..c930d80f5b 100644
--- a/server_engines.php
+++ b/server_engines.php
@@ -8,7 +8,6 @@
 declare(strict_types=1);
 
 use PhpMyAdmin\Controllers\Server\EnginesController;
-use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Response;
 
 if (! defined('ROOT_PATH')) {
@@ -17,15 +16,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..b8391e971f 100644
--- a/server_plugins.php
+++ b/server_plugins.php
@@ -8,7 +8,6 @@
 declare(strict_types=1);
 
 use PhpMyAdmin\Controllers\Server\PluginsController;
-use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Response;
 
 if (! defined('ROOT_PATH')) {
@@ -17,14 +16,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..ac540a3fff 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -10,7 +10,6 @@ declare(strict_types=1);
 use PhpMyAdmin\CheckUserPrivileges;
 use PhpMyAdmin\Core;
 use PhpMyAdmin\DatabaseInterface;
-use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Message;
 use PhpMyAdmin\Relation;
 use PhpMyAdmin\RelationCleanup;
@@ -27,10 +26,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 +42,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..e9572c2aca 100644
--- a/server_replication.php
+++ b/server_replication.php
@@ -9,7 +9,6 @@ declare(strict_types=1);
 
 use PhpMyAdmin\Controllers\Server\ReplicationController;
 use PhpMyAdmin\DatabaseInterface;
-use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\ReplicationGui;
 use PhpMyAdmin\Response;
 
@@ -21,14 +20,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..5cae456c93 100644
--- a/server_sql.php
+++ b/server_sql.php
@@ -9,7 +9,6 @@ declare(strict_types=1);
 
 use PhpMyAdmin\Controllers\Server\SqlController;
 use PhpMyAdmin\DatabaseInterface;
-use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Response;
 use PhpMyAdmin\SqlQueryForm;
 
@@ -19,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 SqlController $controller */
 $controller = $containerBuilder->get(SqlController::class);
diff --git a/server_status.php b/server_status.php
index ac1b32ab8c..c1260e0c0f 100644
--- a/server_status.php
+++ b/server_status.php
@@ -9,7 +9,6 @@ declare(strict_types=1);
 
 use PhpMyAdmin\Controllers\Server\Status\StatusController;
 use PhpMyAdmin\DatabaseInterface;
-use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\ReplicationGui;
 use PhpMyAdmin\Response;
 
@@ -21,14 +20,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..f9482ea196 100644
--- a/server_status_advisor.php
+++ b/server_status_advisor.php
@@ -9,9 +9,7 @@ declare(strict_types=1);
 
 use PhpMyAdmin\Controllers\Server\Status\AdvisorController;
 use PhpMyAdmin\DatabaseInterface;
-use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Response;
-use PhpMyAdmin\Server\Status\Data;
 
 if (! defined('ROOT_PATH')) {
     define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
@@ -20,14 +18,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..61cd70e4bf 100644
--- a/server_status_monitor.php
+++ b/server_status_monitor.php
@@ -9,10 +9,7 @@ declare(strict_types=1);
 
 use PhpMyAdmin\Controllers\Server\Status\MonitorController;
 use PhpMyAdmin\DatabaseInterface;
-use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Response;
-use PhpMyAdmin\Server\Status\Data;
-use PhpMyAdmin\Server\Status\Monitor;
 
 if (! defined('ROOT_PATH')) {
     define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
@@ -22,14 +19,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..2ddd7490e5 100644
--- a/server_status_processes.php
+++ b/server_status_processes.php
@@ -9,9 +9,7 @@ declare(strict_types=1);
 
 use PhpMyAdmin\Controllers\Server\Status\ProcessesController;
 use PhpMyAdmin\DatabaseInterface;
-use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Response;
-use PhpMyAdmin\Server\Status\Data;
 
 if (! defined('ROOT_PATH')) {
     define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
@@ -21,14 +19,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..a3b056f252 100644
--- a/server_status_queries.php
+++ b/server_status_queries.php
@@ -9,9 +9,7 @@ declare(strict_types=1);
 
 use PhpMyAdmin\Controllers\Server\Status\QueriesController;
 use PhpMyAdmin\DatabaseInterface;
-use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Response;
-use PhpMyAdmin\Server\Status\Data;
 
 if (! defined('ROOT_PATH')) {
     define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
@@ -21,14 +19,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..9ed7a3301f 100644
--- a/server_status_variables.php
+++ b/server_status_variables.php
@@ -9,9 +9,7 @@ declare(strict_types=1);
 
 use PhpMyAdmin\Controllers\Server\Status\VariablesController;
 use PhpMyAdmin\DatabaseInterface;
-use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Response;
-use PhpMyAdmin\Server\Status\Data;
 
 if (! defined('ROOT_PATH')) {
     define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
@@ -21,14 +19,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..581980261a 100644
--- a/server_user_groups.php
+++ b/server_user_groups.php
@@ -8,7 +8,6 @@
 declare(strict_types=1);
 
 use PhpMyAdmin\DatabaseInterface;
-use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Relation;
 use PhpMyAdmin\Response;
 use PhpMyAdmin\Server\UserGroups;
@@ -20,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 Relation $relation */
 $relation = $containerBuilder->get('relation');
diff --git a/server_variables.php b/server_variables.php
index 516f122143..c842484e38 100644
--- a/server_variables.php
+++ b/server_variables.php
@@ -8,7 +8,6 @@
 declare(strict_types=1);
 
 use PhpMyAdmin\Controllers\Server\VariablesController;
-use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Response;
 
 if (! defined('ROOT_PATH')) {
@@ -17,15 +16,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..174aa4db0a 100644
--- a/services.yml
+++ b/services.yml
@@ -9,6 +9,14 @@ services:
     class: 'PhpMyAdmin\Config'
     arguments: [!php/const CONFIG_FILE]
 
+  central_columns:
+    class: '\PhpMyAdmin\CentralColumns'
+    arguments: ['@dbi']
+
+  check_user_privileges:
+    class: '\PhpMyAdmin\CheckUserPrivileges'
+    arguments: ['@dbi']
+
   create_add_field:
     class: 'PhpMyAdmin\CreateAddField'
     arguments: ['@dbi']
@@ -46,6 +54,10 @@ services:
   import:
     class: 'PhpMyAdmin\Import'
 
+  di_migration:
+    factory: 'PhpMyAdmin\Di\Migration::getInstance'
+    arguments: ['@service_container']
+
   navigation:
     class: 'PhpMyAdmin\Navigation\Navigation'
     arguments: ['@template', '@relation', '@dbi']
@@ -58,6 +70,12 @@ services:
       transformations: '@transformations'
       template: '@template'
 
+  operations:
+    class: 'PhpMyAdmin\Operations'
+    arguments:
+      dbi: '@dbi'
+      relation: '@relation'
+
   relation:
     class: 'PhpMyAdmin\Relation'
     arguments: ['@dbi', '@template']
@@ -71,6 +89,9 @@ services:
       replication: '@replication'
       template: '@template'
 
+  response:
+    factory: 'PhpMyAdmin\Response::getInstance'
+
   sql_query_form:
     class: 'PhpMyAdmin\SqlQueryForm'
 
@@ -93,3 +114,9 @@ services:
 
   transformations:
     class: 'PhpMyAdmin\Transformations'
+
+  #Aliases
+
+  PhpMyAdmin\Response: '@response'
+
+  PhpMyAdmin\DatabaseInterface: '@dbi'
diff --git a/services_controllers.yml b/services_controllers.yml
index 23058937cf..59390491bf 100644
--- a/services_controllers.yml
+++ b/services_controllers.yml
@@ -22,8 +22,8 @@ services:
       response: '@response'
       dbi: '@dbi'
       template: '@template'
-      db: null
-      centralColumns: null
+      db: '%db%'
+      centralColumns: '@central_columns'
 
   PhpMyAdmin\Controllers\Database\DataDictionaryController:
     class: 'PhpMyAdmin\Controllers\Database\DataDictionaryController'
@@ -31,7 +31,7 @@ services:
       response: '@response'
       dbi: '@dbi'
       template: '@template'
-      db: null
+      db: '%db%'
       relation: '@relation'
       transformations: '@transformations'
 
@@ -41,7 +41,7 @@ services:
       response: '@response'
       dbi: '@dbi'
       template: '@template'
-      db: null
+      db: '%db%'
 
   PhpMyAdmin\Controllers\Database\MultiTableQueryController:
     class: 'PhpMyAdmin\Controllers\Database\MultiTableQueryController'
@@ -49,7 +49,7 @@ services:
       response: '@response'
       dbi: '@dbi'
       template: '@template'
-      db: null
+      db: '%db%'
 
   PhpMyAdmin\Controllers\Database\RoutinesController:
     class: 'PhpMyAdmin\Controllers\Database\RoutinesController'
@@ -57,7 +57,7 @@ services:
       response: '@response'
       dbi: '@dbi'
       template: '@template'
-      db: null
+      db: '%db%'
 
   PhpMyAdmin\Controllers\Database\SqlController:
     class: 'PhpMyAdmin\Controllers\Database\SqlController'
@@ -65,7 +65,7 @@ services:
       response: '@response'
       dbi: '@dbi'
       template: '@template'
-      db: null
+      db: '%db%'
 
   PhpMyAdmin\Controllers\Database\StructureController:
     class: 'PhpMyAdmin\Controllers\Database\StructureController'
@@ -73,7 +73,7 @@ services:
       response: '@response'
       dbi: '@dbi'
       template: '@template'
-      db: null
+      db: '%db%'
       relation: '@relation'
       replication: '@replication'
 
@@ -83,7 +83,7 @@ services:
       response: '@response'
       dbi: '@dbi'
       template: '@template'
-      db: null
+      db: '%db%'
 
   PhpMyAdmin\Controllers\HomeController:
     class: 'PhpMyAdmin\Controllers\HomeController'
@@ -206,8 +206,8 @@ services:
       response: '@response'
       dbi: '@dbi'
       template: '@template'
-      db: null
-      table: null
+      db: '%db%'
+      table: '%table%'
       sql_query: null
       url_query: null
       cfg: null
@@ -218,8 +218,8 @@ services:
       response: '@response'
       dbi: '@dbi'
       template: '@template'
-      db: null
-      table: null
+      db: '%db%'
+      table: '%table%'
       sql_query: null
       url_params: null
       goto: null
@@ -232,9 +232,9 @@ services:
       response: '@response'
       dbi: '@dbi'
       template: '@template'
-      db: null
-      table: null
-      index: null
+      db: '%db%'
+      table: '%table%'
+      index: '%index%'
 
   PhpMyAdmin\Controllers\Table\RelationController:
     class: 'PhpMyAdmin\Controllers\Table\RelationController'
@@ -242,8 +242,8 @@ services:
       response: '@response'
       dbi: '@dbi'
       template: '@template'
-      db: null
-      table: null
+      db: '%db%'
+      table: '%table%'
       options_array: null
       cfgRelation: null
       tbl_storage_engine: null
@@ -258,8 +258,8 @@ services:
       response: '@response'
       dbi: '@dbi'
       template: '@template'
-      db: null
-      table: null
+      db: '%db%'
+      table: '%table%'
       searchType: null
       url_query: null
       relation: '@relation'
@@ -270,8 +270,8 @@ services:
       response: '@response'
       dbi: '@dbi'
       template: '@template'
-      db: null
-      table: null
+      db: '%db%'
+      table: '%table%'
 
   PhpMyAdmin\Controllers\Table\StructureController:
     class: 'PhpMyAdmin\Controllers\Table\StructureController'
@@ -279,8 +279,8 @@ services:
       response: '@response'
       dbi: '@dbi'
       template: '@template'
-      db: null
-      table: null
+      db: '%db%'
+      table: '%table%'
       db_is_system_schema: null
       tbl_is_view: null
       tbl_storage_engine: null
diff --git a/tbl_addfield.php b/tbl_addfield.php
index 321e9f5eb4..71e365cb43 100644
--- a/tbl_addfield.php
+++ b/tbl_addfield.php
@@ -7,9 +7,9 @@
  */
 declare(strict_types=1);
 
+use PhpMyAdmin\Config;
 use PhpMyAdmin\CreateAddField;
 use PhpMyAdmin\DatabaseInterface;
-use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Message;
 use PhpMyAdmin\Response;
 use PhpMyAdmin\Transformations;
@@ -20,18 +20,13 @@ if (! defined('ROOT_PATH')) {
     define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
 }
 
-global $cfg, $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);
 
 $header = $response->getHeader();
 $scripts = $header->getScripts();
@@ -43,6 +38,16 @@ Util::checkParameters(['db', 'table']);
 /** @var Transformations $transformations */
 $transformations = $containerBuilder->get('transformations');
 
+/** @var string $db */
+$db = $containerBuilder->getParameter('db');
+
+/** @var string $table */
+$table = $containerBuilder->getParameter('table');
+
+/** @var Config $config */
+$config = $containerBuilder->get('config');
+$cfg = $config->settings;
+
 /**
  * Defines the url to return to in case of error in a sql statement
  */
diff --git a/tbl_chart.php b/tbl_chart.php
index eb21a4b4be..e7964461aa 100644
--- a/tbl_chart.php
+++ b/tbl_chart.php
@@ -8,8 +8,6 @@
 declare(strict_types=1);
 
 use PhpMyAdmin\Controllers\Table\ChartController;
-use PhpMyAdmin\Di\Container;
-use PhpMyAdmin\Response;
 use Symfony\Component\DependencyInjection\Definition;
 
 if (! defined('ROOT_PATH')) {
@@ -18,14 +16,8 @@ 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);
-
 /* Define dependencies for the concerned controller */
 $dependency_definitions = [
-    'db' => $container->get('db'),
-    'table' => $container->get('table'),
     'sql_query' => &$GLOBALS['sql_query'],
     'url_query' => &$GLOBALS['url_query'],
     'cfg' => &$GLOBALS['cfg'],
diff --git a/tbl_create.php b/tbl_create.php
index 14b7f09dc8..bceb375225 100644
--- a/tbl_create.php
+++ b/tbl_create.php
@@ -7,10 +7,10 @@
  */
 declare(strict_types=1);
 
+use PhpMyAdmin\Config;
 use PhpMyAdmin\Core;
 use PhpMyAdmin\CreateAddField;
 use PhpMyAdmin\DatabaseInterface;
-use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Response;
 use PhpMyAdmin\Transformations;
 use PhpMyAdmin\Url;
@@ -20,23 +20,29 @@ if (! defined('ROOT_PATH')) {
     define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
 }
 
-global $cfg, $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);
 
 // Check parameters
 Util::checkParameters(['db']);
 
-$transformations = new Transformations();
+/** @var Transformations $transformations */
+$transformations = $containerBuilder->get('transformations');
+
+/** @var string $db */
+$db = $containerBuilder->getParameter('db');
+
+/** @var string $table */
+$table = $containerBuilder->getParameter('table');
+
+/** @var Config $config */
+$config = $containerBuilder->get('config');
+$cfg = $config->settings;
 
 /* Check if database name is empty */
 if (strlen($db) === 0) {
diff --git a/tbl_find_replace.php b/tbl_find_replace.php
index 56ca32d2f0..f6747470ca 100644
--- a/tbl_find_replace.php
+++ b/tbl_find_replace.php
@@ -10,27 +10,20 @@
 declare(strict_types=1);
 
 use PhpMyAdmin\Controllers\Table\SearchController;
-use PhpMyAdmin\Di\Container;
-use PhpMyAdmin\Response;
 use Symfony\Component\DependencyInjection\Definition;
 
 if (! defined('ROOT_PATH')) {
     define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
 }
 
-global $url_query;
+/** @var string $url_query Overwritten in tbl_common.inc.php */
+$url_query = null;
 
 require_once ROOT_PATH . 'libraries/common.inc.php';
 require_once ROOT_PATH . 'libraries/tbl_common.inc.php';
 
-$container = Container::getDefaultContainer();
-$container->set(Response::class, Response::getInstance());
-$container->alias('response', Response::class);
-
 /* Define dependencies for the concerned controller */
 $dependency_definitions = [
-    'db' => $container->get('db'),
-    'table' => $container->get('table'),
     'searchType' => 'replace',
     'url_query' => &$url_query,
 ];
diff --git a/tbl_get_field.php b/tbl_get_field.php
index 20a0bf2e9c..898c4d96ef 100644
--- a/tbl_get_field.php
+++ b/tbl_get_field.php
@@ -9,7 +9,6 @@ declare(strict_types=1);
 
 use PhpMyAdmin\Core;
 use PhpMyAdmin\DatabaseInterface;
-use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Mime;
 use PhpMyAdmin\Response;
 
@@ -17,18 +16,19 @@ if (! defined('ROOT_PATH')) {
     define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
 }
 
-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 string $db */
+$db = $containerBuilder->getParameter('db');
+
+/** @var string $table */
+$table = $containerBuilder->getParameter('table');
 
 $response->disable();
 
diff --git a/tbl_gis_visualization.php b/tbl_gis_visualization.php
index d58267c2ab..2f08e14d30 100644
--- a/tbl_gis_visualization.php
+++ b/tbl_gis_visualization.php
@@ -19,14 +19,8 @@ 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);
-
 /* Define dependencies for the concerned controller */
 $dependency_definitions = [
-    'db' => $container->get('db'),
-    'table' => $container->get('table'),
     'sql_query' => &$GLOBALS['sql_query'],
     'url_params' => &$GLOBALS['url_params'],
     'goto' => Util::getScriptNameForOption(
diff --git a/tbl_indexes.php b/tbl_indexes.php
index 4ea846d97a..e9a6cda4b9 100644
--- a/tbl_indexes.php
+++ b/tbl_indexes.php
@@ -9,10 +9,7 @@ declare(strict_types=1);
 
 use PhpMyAdmin\Controllers\Table\IndexesController;
 use PhpMyAdmin\DatabaseInterface;
-use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Index;
-use PhpMyAdmin\Response;
-use Symfony\Component\DependencyInjection\Definition;
 
 if (! defined('ROOT_PATH')) {
     define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
@@ -20,16 +17,14 @@ 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);
-
-/* Define dependencies for the concerned controller */
-$db = $container->get('db');
-$table = $container->get('table');
-
 /** @var DatabaseInterface $dbi */
-$dbi = $container->get(DatabaseInterface::class);
+$dbi = $containerBuilder->get('dbi');
+
+/** @var string $db */
+$db = $containerBuilder->getParameter('db');
+
+/** @var string $table */
+$table = $containerBuilder->getParameter('table');
 
 if (! isset($_POST['create_edit_table'])) {
     include_once ROOT_PATH . 'libraries/tbl_common.inc.php';
@@ -46,21 +41,7 @@ if (isset($_POST['index'])) {
 }
 
 /* Define dependencies for the concerned controller */
-$dependency_definitions = [
-    'db' => $container->get('db'),
-    'table' => $container->get('table'),
-    'index' => $index,
-];
-
-/** @var Definition $definition */
-$definition = $containerBuilder->getDefinition(IndexesController::class);
-array_map(
-    static function (string $parameterName, $value) use ($definition) {
-        $definition->replaceArgument($parameterName, $value);
-    },
-    array_keys($dependency_definitions),
-    $dependency_definitions
-);
+$containerBuilder->setParameter('index', $index);
 
 /** @var IndexesController $controller */
 $controller = $containerBuilder->get(IndexesController::class);
diff --git a/tbl_operations.php b/tbl_operations.php
index 1f9bcd8fa5..f8bb73ba09 100644
--- a/tbl_operations.php
+++ b/tbl_operations.php
@@ -9,7 +9,6 @@ declare(strict_types=1);
 
 use PhpMyAdmin\CheckUserPrivileges;
 use PhpMyAdmin\DatabaseInterface;
-use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Index;
 use PhpMyAdmin\Message;
 use PhpMyAdmin\Operations;
@@ -23,20 +22,24 @@ if (! defined('ROOT_PATH')) {
     define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
 }
 
-global $db, $table, $url_query;
+global $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);
+/** @var string $db */
+$db = $containerBuilder->getParameter('db');
+
+/** @var string $table */
+$table = $containerBuilder->getParameter('table');
+
+/** @var CheckUserPrivileges $checkUserPrivileges */
+$checkUserPrivileges = $containerBuilder->get('check_user_privileges');
 $checkUserPrivileges->getPrivileges();
 
 // lower_case_table_names=1 `DB` becomes `db`
@@ -64,10 +67,11 @@ $url_params['goto'] = $url_params['back'] = 'tbl_operations.php';
  */
 /** @var Relation $relation */
 $relation = $containerBuilder->get('relation');
-$operations = new Operations($dbi, $relation);
-
 $cfgRelation = $relation->getRelationsParam();
 
+/** @var Operations $operations */
+$operations = $containerBuilder->get('operations');
+
 // reselect current db (needed in some cases probably due to
 // the calling of PhpMyAdmin\Relation)
 $dbi->selectDb($db);
diff --git a/tbl_relation.php b/tbl_relation.php
index 851e55b7f7..89da4964a5 100644
--- a/tbl_relation.php
+++ b/tbl_relation.php
@@ -17,9 +17,7 @@ declare(strict_types=1);
 
 use PhpMyAdmin\Controllers\Table\RelationController;
 use PhpMyAdmin\DatabaseInterface;
-use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Relation;
-use PhpMyAdmin\Response;
 use PhpMyAdmin\Table;
 use PhpMyAdmin\Util;
 use Symfony\Component\DependencyInjection\Definition;
@@ -30,16 +28,12 @@ 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);
-
 /* Define dependencies for the concerned controller */
-$db = $container->get('db');
-$table = $container->get('table');
+$db = $containerBuilder->getParameter('db');
+$table = $containerBuilder->getParameter('table');
 
 /** @var DatabaseInterface $dbi */
-$dbi = $container->get(DatabaseInterface::class);
+$dbi = $containerBuilder->get(DatabaseInterface::class);
 
 $options_array = [
     'CASCADE' => 'CASCADE',
@@ -57,8 +51,6 @@ $upd_query = new Table($table, $db, $dbi);
 
 /* Define dependencies for the concerned controller */
 $dependency_definitions = [
-    'db' => $container->get('db'),
-    'table' => $container->get('table'),
     'options_array' => $options_array,
     'cfgRelation' => $cfgRelation,
     'tbl_storage_engine' => $tbl_storage_engine,
diff --git a/tbl_sql.php b/tbl_sql.php
index 88f00eafe3..25dd7f3786 100644
--- a/tbl_sql.php
+++ b/tbl_sql.php
@@ -18,34 +18,16 @@ if (! defined('ROOT_PATH')) {
     define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
 }
 
-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);
-
-/* Define dependencies for the concerned controller */
-$dependency_definitions = [
-    'db' => $container->get('db'),
-    'table' => $container->get('table'),
-];
-
-/** @var Definition $definition */
-$definition = $containerBuilder->getDefinition(SqlController::class);
-array_map(
-    static function (string $parameterName, $value) use ($definition) {
-        $definition->replaceArgument($parameterName, $value);
-    },
-    array_keys($dependency_definitions),
-    $dependency_definitions
-);
+$dbi = $containerBuilder->get(DatabaseInterface::class);
 
 /** @var SqlController $controller */
 $controller = $containerBuilder->get(SqlController::class);
diff --git a/tbl_structure.php b/tbl_structure.php
index 650353c72f..294a390c1b 100644
--- a/tbl_structure.php
+++ b/tbl_structure.php
@@ -10,31 +10,28 @@ declare(strict_types=1);
 
 use PhpMyAdmin\Controllers\Table\StructureController;
 use PhpMyAdmin\DatabaseInterface;
-use PhpMyAdmin\Di\Container;
-use PhpMyAdmin\Response;
 use Symfony\Component\DependencyInjection\Definition;
 
 if (! defined('ROOT_PATH')) {
     define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
 }
 
-global $db, $table, $db_is_system_schema, $tbl_is_view, $tbl_storage_engine;
+global $db_is_system_schema, $tbl_is_view, $tbl_storage_engine;
 global $table_info_num_rows, $tbl_collation, $showtable;
 
 require_once ROOT_PATH . 'libraries/common.inc.php';
 
-$container = Container::getDefaultContainer();
-$container->set(Response::class, Response::getInstance());
-$container->alias('response', Response::class);
-
 /** @var DatabaseInterface $dbi */
-$dbi = $container->get(DatabaseInterface::class);
+$dbi = $containerBuilder->get('dbi');
 
-$dbi->selectDb($GLOBALS['db']);
-$table_class_object = $dbi->getTable(
-    $GLOBALS['db'],
-    $GLOBALS['table']
-);
+/** @var string $db */
+$db = $containerBuilder->getParameter('db');
+
+/** @var string $table */
+$table = $containerBuilder->getParameter('table');
+
+$dbi->selectDb($db);
+$table_class_object = $dbi->getTable($db, $table);
 $reread_info = $table_class_object->getStatusInfo(null, true);
 $GLOBALS['showtable'] = $table_class_object->getStatusInfo(null, (isset($reread_info) && $reread_info ? true : false));
 if ($table_class_object->isView()) {
@@ -48,8 +45,6 @@ $tbl_collation = $table_class_object->getCollation();
 $table_info_num_rows = $table_class_object->getNumRows();
 /* Define dependencies for the concerned controller */
 $dependency_definitions = [
-    'db' => $db,
-    'table' => $table,
     'db_is_system_schema' => $db_is_system_schema,
     'tbl_is_view' => $tbl_is_view,
     'tbl_storage_engine' => $tbl_storage_engine,
diff --git a/test/bootstrap-dist.php b/test/bootstrap-dist.php
index e8e64e53ca..1d3fd1f612 100644
--- a/test/bootstrap-dist.php
+++ b/test/bootstrap-dist.php
@@ -9,6 +9,7 @@ declare(strict_types=1);
 
 use PhpMyAdmin\Config;
 use PhpMyAdmin\DatabaseInterface;
+use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\LanguageManager;
 use PhpMyAdmin\MoTranslator\Loader;
 use PhpMyAdmin\Theme;
@@ -79,7 +80,9 @@ define('PMA_MAJOR_VERSION', $GLOBALS['PMA_Config']->get('PMA_MAJOR_VERSION'));
 LanguageManager::getInstance()->getLanguage('en')->activate();
 
 /* Load Database interface */
-DatabaseInterface::load();
+$oldContainer = Container::getDefaultContainer();
+$oldContainer->set(DatabaseInterface::class, DatabaseInterface::load());
+$oldContainer->alias('dbi', DatabaseInterface::class);
 
 // Set proxy information from env, if available
 $http_proxy = getenv('http_proxy');
diff --git a/test/bootstrap-phpstan.php b/test/bootstrap-phpstan.php
index f1bd76bf53..dfe1147a1e 100644
--- a/test/bootstrap-phpstan.php
+++ b/test/bootstrap-phpstan.php
@@ -9,6 +9,7 @@ declare(strict_types=1);
 
 use PhpMyAdmin\Config;
 use PhpMyAdmin\DatabaseInterface;
+use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\MoTranslator\Loader;
 
 if (! defined('ROOT_PATH')) {
@@ -38,4 +39,6 @@ $GLOBALS['PMA_Config']->enableBc();// Defines constants, phpstan:level=1
 
 Loader::loadFunctions();
 
-DatabaseInterface::load();
+$oldContainer = Container::getDefaultContainer();
+$oldContainer->set(DatabaseInterface::class, DatabaseInterface::load());
+$oldContainer->alias('dbi', DatabaseInterface::class);
diff --git a/transformation_overview.php b/transformation_overview.php
index 9558b9c47c..d8241c9871 100644
--- a/transformation_overview.php
+++ b/transformation_overview.php
@@ -11,7 +11,6 @@ use PhpMyAdmin\Controllers\TransformationOverviewController;
 use PhpMyAdmin\DatabaseInterface;
 use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Response;
-use PhpMyAdmin\Transformations;
 
 if (! defined('ROOT_PATH')) {
     define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
diff --git a/transformation_wrapper.php b/transformation_wrapper.php
index 27bb0b9e0c..a9746f30fa 100644
--- a/transformation_wrapper.php
+++ b/transformation_wrapper.php
@@ -9,7 +9,6 @@ declare(strict_types=1);
 
 use PhpMyAdmin\Core;
 use PhpMyAdmin\DatabaseInterface;
-use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Relation;
 use PhpMyAdmin\Response;
 use PhpMyAdmin\Transformations;
@@ -24,14 +23,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..2933652304 100644
--- a/view_operations.php
+++ b/view_operations.php
@@ -8,7 +8,6 @@
 declare(strict_types=1);
 
 use PhpMyAdmin\DatabaseInterface;
-use PhpMyAdmin\Di\Container;
 use PhpMyAdmin\Message;
 use PhpMyAdmin\Operations;
 use PhpMyAdmin\Relation;
@@ -25,14 +24,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']);