diff --git a/phpBB/config/avatars.yml b/phpBB/config/avatars.yml
index 8eef0f837f..fa0f07372a 100644
--- a/phpBB/config/avatars.yml
+++ b/phpBB/config/avatars.yml
@@ -46,3 +46,10 @@ services:
             - [set_name, [avatar.driver.upload]]
         tags:
             - { name: avatar.driver }
+
+    avatar.driver_collection:
+        class: phpbb_di_service_collection
+        arguments:
+            - @service_container
+        tags:
+            - { name: service_collection, tag: avatar.driver }
diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml
index 5107c5597e..6bde65ec49 100644
--- a/phpBB/config/services.yml
+++ b/phpBB/config/services.yml
@@ -7,13 +7,6 @@ services:
     auth:
         class: phpbb_auth
 
-    avatar.driver_collection:
-        class: phpbb_di_service_collection
-        arguments:
-            - @service_container
-        tags:
-            - { name: service_collection, tag: avatar.driver }
-
     avatar.manager:
         class: phpbb_avatar_manager
         arguments: