diff --git a/phpBB/config/default/container/services_attachment.yml b/phpBB/config/default/container/services_attachment.yml
new file mode 100644
index 0000000000..8e3fbe8f35
--- /dev/null
+++ b/phpBB/config/default/container/services_attachment.yml
@@ -0,0 +1,32 @@
+services:
+    attachment.delete:
+        class: phpbb\attachment\delete
+        scope: prototype
+        arguments:
+            - @config
+            - @dbal.conn
+            - @dispatcher
+            - @filesystem
+            - @attachment.resync
+            - %core.root_path%
+
+    attachment.resync:
+        class: phpbb\attachment\resync
+        scope: prototype
+        arguments:
+            - @dbal.conn
+
+    attachment.upload:
+        class: phpbb\attachment\upload
+        scope: prototype
+        arguments:
+            - @auth
+            - @cache
+            - @config
+            - @files.upload
+            - @language
+            - @mimetype.guesser
+            - @dispatcher
+            - @plupload
+            - @user
+            - %core.root_path%
diff --git a/phpBB/config/default/container/services_files.yml b/phpBB/config/default/container/services_files.yml
index b94b48606d..cfdade37df 100644
--- a/phpBB/config/default/container/services_files.yml
+++ b/phpBB/config/default/container/services_files.yml
@@ -1,36 +1,4 @@
 services:
-    attachment.delete:
-        class: phpbb\attachment\delete
-        scope: prototype
-        arguments:
-            - @config
-            - @dbal.conn
-            - @dispatcher
-            - @filesystem
-            - @attachment.resync
-            - %core.root_path%
-
-    attachment.resync:
-        class: phpbb\attachment\resync
-        scope: prototype
-        arguments:
-            - @dbal.conn
-
-    attachment.upload:
-        class: phpbb\attachment\upload
-        scope: prototype
-        arguments:
-            - @auth
-            - @cache
-            - @config
-            - @files.upload
-            - @language
-            - @mimetype.guesser
-            - @dispatcher
-            - @plupload
-            - @user
-            - %core.root_path%
-
     filesystem:
         class: phpbb\filesystem\filesystem