diff --git a/typo3/sysext/core/Classes/ServiceProvider.php b/typo3/sysext/core/Classes/ServiceProvider.php
index dd9dc981eaf7eb7866dbdc1977dc5fd87d9bb4f5..44cf4125dca30cbe5809acf168eefedf225bc62d 100644
--- a/typo3/sysext/core/Classes/ServiceProvider.php
+++ b/typo3/sysext/core/Classes/ServiceProvider.php
@@ -58,6 +58,7 @@ class ServiceProvider extends AbstractServiceProvider
             Database\ConnectionPool::class => self::getConnectionPool(...),
             Database\DriverMiddlewareService::class => self::getDriverMiddlewaresService(...),
             Charset\CharsetConverter::class => self::getCharsetConverter(...),
+            Configuration\Loader\YamlFileLoader::class => self::getYamlFileLoader(...),
             Configuration\SiteConfiguration::class => self::getSiteConfiguration(...),
             Command\ListCommand::class => self::getListCommand(...),
             HelpCommand::class => self::getHelpCommand(...),
@@ -178,6 +179,11 @@ class ServiceProvider extends AbstractServiceProvider
         return self::new($container, Charset\CharsetConverter::class);
     }
 
+    public static function getYamlFileLoader(ContainerInterface $container): Configuration\Loader\YamlFileLoader
+    {
+        return self::new($container, Configuration\Loader\YamlFileLoader::class);
+    }
+
     public static function getSiteConfiguration(ContainerInterface $container): Configuration\SiteConfiguration
     {
         return self::new($container, Configuration\SiteConfiguration::class, [
diff --git a/typo3/sysext/install/Classes/ServiceProvider.php b/typo3/sysext/install/Classes/ServiceProvider.php
index b9c09ad9080791a92bdcb1d255c14c44870cebc8..13e7f2783f1aad2757e64f532d7ef665dd15c16c 100644
--- a/typo3/sysext/install/Classes/ServiceProvider.php
+++ b/typo3/sysext/install/Classes/ServiceProvider.php
@@ -109,7 +109,6 @@ class ServiceProvider extends AbstractServiceProvider
             Database\PermissionsCheck::class => self::getPermissionsCheck(...),
             Mailer::class => self::getMailer(...),
             Updates\DatabaseUpdatedPrerequisite::class => self::getDatabaseUpdatedPrerequisite(...),
-            YamlFileLoader::class => self::getYamlFileLoader(...),
         ];
     }
 
@@ -437,11 +436,6 @@ class ServiceProvider extends AbstractServiceProvider
         ]);
     }
 
-    public static function getYamlFileLoader(ContainerInterface $container): YamlFileLoader
-    {
-        return new YamlFileLoader();
-    }
-
     public static function configureCommands(ContainerInterface $container, CommandRegistry $commandRegistry): CommandRegistry
     {
         $commandRegistry->addLazyCommand(