diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index fec5e69db0..1fb520be90 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,2 +1,5 @@
 # App maintainers
-* @ChristophWurst
+* @ChristophWurst @gretad @kesselb
+
+/css @ChristophWurst @gretad
+/lib @ChristophWurst @kesselb
diff --git a/README.md b/README.md
index cb9b52de04..23f73c01cd 100644
--- a/README.md
+++ b/README.md
@@ -49,8 +49,9 @@ Learn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud
 
 ## Maintainers
 
-* [Christoph Wurst](https://github.com/ChristophWurst)
-* [Nextcloud Groupware team](https://github.com/nextcloud/groupware/#members)
+* [@ChristophWurst](https://github.com/ChristophWurst)
+* [@gretad](https://github.com/gretad)
+* [@kesselb](https://github.com/kesselb)
 
 ## Installation
 
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 7ed5c43edf..b84a9aaa1b 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -36,8 +36,9 @@ Learn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud
 	]]></description>
 	<version>4.0.0-beta.2</version>
 	<licence>agpl</licence>
-	<author>Christoph Wurst</author>
-	<author homepage="https://github.com/nextcloud/groupware">Nextcloud Groupware Team</author>
+	<author homepage="https://github.com/ChristophWurst">Christoph Wurst</author>
+	<author homepage="https://github.com/gretad">Greta</author>
+	<author homepage="https://github.com/kesselb">kesselb</author>
 	<namespace>Mail</namespace>
 	<documentation>
 		<user>https://github.com/nextcloud/mail/blob/main/doc/user.md</user>