diff --git a/core/core.events.yml b/core/core.events.yml
index 7dcb4dc..baa3323 100644
--- a/core/core.events.yml
+++ b/core/core.events.yml
@@ -1,15 +1,15 @@
 subscribers:
   config.init:
-    - callback: Drupal\Core\EventSubscriber\ConfigGlobalOverrideSubscriber::configInit
+    - callback: config_global_override_subscriber:configInit
       priority: 30
   config.importer.import:
-    - callback: Drupal\Core\EventSubscriber\ConfigSnapshotSubscriber::onConfigImporterImport
+    - callback: config_global_override_subscriber:onConfigImporterImport
       priority: 40
   config.importer.validate:
-    - callback: Drupal\Core\EventSubscriber\ConfigImportSubscriber::onConfigImporterValidate
+    - callback: config_import_subscriber:onConfigImporterValidate
       priority: 40
   config.installer.validate:
-    - callback: Drupal\Core\EventSubscriber\ConfigImportSubscriber::onConfigImporterValidate
+    - callback: config_import_subscriber:onConfigImporterValidate
       priority: 40
   kernel.request:
     # Priority must be higher than LanguageRequestSubscriber as LanguageManager
diff --git a/core/core.services.yml b/core/core.services.yml
index 5cf432d..072d017 100644
--- a/core/core.services.yml
+++ b/core/core.services.yml
@@ -467,6 +467,14 @@ services:
   request_close_subscriber:
     class: Drupal\Core\EventSubscriber\RequestCloseSubscriber
     arguments: ['@module_handler']
+  config_global_override_subscriber:
+    class: Drupal\Core\EventSubscriber\ConfigGlobalOverrideSubscriber
+    tags:
+      - { name: event_subscriber }
+  config_import_subscriber:
+    class: Drupal\Core\EventSubscriber\ConfigImportSubscriber
+    tags:
+      - { name: event_subscriber }
   config_snapshot_subscriber:
     class: Drupal\Core\EventSubscriber\ConfigSnapshotSubscriber
     arguments: ['@config.storage', '@config.storage.snapshot']