diff --git a/phpBB/config/installer/container/services.yml b/phpBB/config/installer/container/services.yml
index b4e731306d..70fb0ee308 100644
--- a/phpBB/config/installer/container/services.yml
+++ b/phpBB/config/installer/container/services.yml
@@ -1,5 +1,6 @@
 imports:
     - { resource: services_installer.yml }
+    - { resource: services_avatar.yml }
     - { resource: ../../default/container/services_event.yml }
     - { resource: ../../default/container/services_filesystem.yml }
     - { resource: ../../default/container/services_http.yml }
diff --git a/phpBB/config/installer/container/services_avatar.yml b/phpBB/config/installer/container/services_avatar.yml
new file mode 100644
index 0000000000..31d28e77fb
--- /dev/null
+++ b/phpBB/config/installer/container/services_avatar.yml
@@ -0,0 +1,25 @@
+services:
+    avatar.manager:
+        class: phpbb\avatar\manager
+        arguments:
+            - '@config'
+            - '@dispatcher'
+            - '@avatar.driver_collection'
+
+    avatar.helper:
+        class: phpbb\avatar\helper
+        arguments:
+            - '@config'
+            - '@dispatcher'
+            - '@language'
+            - '@avatar.manager'
+            - '@path_helper'
+            - '@user'
+
+    # ----- Avatar drivers -----
+    avatar.driver_collection:
+        class: phpbb\di\service_collection
+        arguments:
+            - '@service_container'
+        tags:
+            - { name: service_collection, tag: avatar.driver }