diff --git a/apps/comments/appinfo/info.xml b/apps/comments/appinfo/info.xml
index b10137b14f..b67def1fb9 100644
--- a/apps/comments/appinfo/info.xml
+++ b/apps/comments/appinfo/info.xml
@@ -4,7 +4,8 @@
 	<name>Comments</name>
 	<description>Files app plugin to add comments to files</description>
 	<licence>AGPL</licence>
-	<author>Arthur Schiwon, Vincent Petry</author>
+	<author>Arthur Schiwon</author>
+	<author>Vincent Petry</author>
 	<default_enable/>
 	<version>1.3.0</version>
 	<dependencies>
diff --git a/apps/encryption/appinfo/info.xml b/apps/encryption/appinfo/info.xml
index 092d91e487..36b6774c6e 100644
--- a/apps/encryption/appinfo/info.xml
+++ b/apps/encryption/appinfo/info.xml
@@ -13,7 +13,8 @@
 	</description>
 	<name>Default encryption module</name>
 	<licence>AGPL</licence>
-	<author>Bjoern Schiessle, Clark Tomlinson</author>
+	<author>Bjoern Schiessle</author>
+	<author>Clark Tomlinson</author>
 	<documentation>
 		<user>user-encryption</user>
 		<admin>admin-encryption</admin>
diff --git a/apps/federatedfilesharing/appinfo/info.xml b/apps/federatedfilesharing/appinfo/info.xml
index 541f75dfea..aaacf3ec80 100644
--- a/apps/federatedfilesharing/appinfo/info.xml
+++ b/apps/federatedfilesharing/appinfo/info.xml
@@ -4,7 +4,8 @@
     <name>Federated file sharing</name>
     <description>Provide federated file sharing across servers</description>
     <licence>AGPL</licence>
-    <author>Bjoern Schiessle, Roeland Jago Douma</author>
+    <author>Bjoern Schiessle</author>
+    <author>Roeland Jago Douma</author>
     <version>1.3.0</version>
     <namespace>FederatedFileSharing</namespace>
     <category>other</category>
diff --git a/apps/files/appinfo/info.xml b/apps/files/appinfo/info.xml
index fc696dcca4..c4b9e18ed0 100644
--- a/apps/files/appinfo/info.xml
+++ b/apps/files/appinfo/info.xml
@@ -4,7 +4,8 @@
 	<name>Files</name>
 	<description>File Management</description>
 	<licence>AGPL</licence>
-	<author>Robin Appelman, Vincent Petry</author>
+	<author>Robin Appelman</author>
+	<author>Vincent Petry</author>
 	<default_enable/>
 	<version>1.8.0</version>
 	<types>
diff --git a/apps/files_external/appinfo/info.xml b/apps/files_external/appinfo/info.xml
index bae4fb894a..5772b89ba9 100644
--- a/apps/files_external/appinfo/info.xml
+++ b/apps/files_external/appinfo/info.xml
@@ -8,7 +8,9 @@ This application enables administrators to configure connections to external sto
 External storage can be configured using the GUI or at the command line. This second option provides the advanced user with more flexibility for configuring bulk external storage mounts and setting mount priorities. More information is available in the external storage GUI documentation and the external storage Configuration File documentation.
 	</description>
 	<licence>AGPL</licence>
-	<author>Robin Appelman, Michael Gapczynski, Vincent Petry</author>
+	<author>Robin Appelman</author>
+	<author>Michael Gapczynski</author>
+	<author>Vincent Petry</author>
 	<documentation>
 		<admin>admin-external-storage</admin>
 	</documentation>
diff --git a/apps/files_sharing/appinfo/info.xml b/apps/files_sharing/appinfo/info.xml
index fa22c9085d..f4119a5597 100644
--- a/apps/files_sharing/appinfo/info.xml
+++ b/apps/files_sharing/appinfo/info.xml
@@ -8,7 +8,8 @@ Turning the feature off removes shared files and folders on the server for all s
 
 	</description>
 	<licence>AGPL</licence>
-	<author>Michael Gapczynski, Bjoern Schiessle</author>
+	<author>Michael Gapczynski</author>
+	<author>Bjoern Schiessle</author>
 	<default_enable/>
 	<version>1.5.0</version>
 	<types>
diff --git a/apps/files_versions/appinfo/info.xml b/apps/files_versions/appinfo/info.xml
index 7d0f7f5e44..cb7d5d07d3 100644
--- a/apps/files_versions/appinfo/info.xml
+++ b/apps/files_versions/appinfo/info.xml
@@ -3,7 +3,8 @@
 	<id>files_versions</id>
 	<name>Versions</name>
 	<licence>AGPL</licence>
-	<author>Frank Karlitschek, Bjoern Schiessle</author>
+	<author>Frank Karlitschek</author>
+	<author>Bjoern Schiessle</author>
 	<description>
 	This application automatically maintains older versions of files that are changed. When enabled, a hidden versions folder is provisioned in every user’s directory and is used to store old file versions. A user can revert to an older version through the web interface at any time, with the replaced file becoming a version. The app automatically manages the versions folder to ensure the user doesn’t run out of Quota because of versions.
 In addition to the expiry of versions, the versions app makes certain never to use more than 50% of the user’s currently available free space. If stored versions exceed this limit, the app will delete the oldest versions first until it meets this limit. More information is available in the Versions documentation.
diff --git a/apps/systemtags/appinfo/info.xml b/apps/systemtags/appinfo/info.xml
index 7946908083..cdefb3dcf2 100644
--- a/apps/systemtags/appinfo/info.xml
+++ b/apps/systemtags/appinfo/info.xml
@@ -5,7 +5,8 @@
 	<description>Collaborative tagging functionality which shares tags among users. Great for teams.
 	(If you are a provider with a multi-tenancy installation, it is advised to deactivate this app as tags are shared.)</description>
 	<licence>AGPL</licence>
-	<author>Vincent Petry, Joas Schilling</author>
+	<author>Vincent Petry</author>
+	<author>Joas Schilling</author>
 	<default_enable/>
 	<version>1.3.0</version>
 	<dependencies>
diff --git a/apps/user_ldap/appinfo/info.xml b/apps/user_ldap/appinfo/info.xml
index c688da82f1..29d8b5df02 100644
--- a/apps/user_ldap/appinfo/info.xml
+++ b/apps/user_ldap/appinfo/info.xml
@@ -8,7 +8,8 @@ A user logs into Nextcloud with their LDAP or AD credentials, and is granted acc
 
 	</description>
 	<licence>AGPL</licence>
-	<author>Dominik Schmidt and Arthur Schiwon</author>
+	<author>Dominik Schmidt</author>
+	<author>Arthur Schiwon</author>
 	<version>1.3.0</version>
 	<types>
 		<authentication/>