diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 4caf4b2cd1925..de114da1c5ae1 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -4,8 +4,10 @@
 /apps/comments/appinfo/info.xml               @marcelklehr @Pytal
 /apps/contactsinteraction/appinfo/info.xml    @kesselb @miaulalala @ChristophWurst @GretaD @hamza221 @st3iny
 /apps/dashboard/appinfo/info.xml              @julien-nc @juliushaertl
-/apps/dav/lib/CalDAV                          @ChristophWurst @miaulalala @tcitworld
-/apps/dav/lib/CardDAV                         @ChristophWurst @miaulalala @tcitworld
+/apps/dav/lib/CalDAV                          @miaulalala @st3iny @SebastianKrupinski
+/apps/dav/lib/CardDAV                         @miaulalala @st3iny @SebastianKrupinski
+/apps/dav/tests/unit/CalDAV                   @miaulalala @st3iny @SebastianKrupinski
+/apps/dav/tests/unit/CardDAV                  @miaulalala @st3iny @SebastianKrupinski
 /apps/encryption/appinfo/info.xml             @come-nc @icewind1991
 /apps/federatedfilesharing/appinfo/info.xml   @icewind1991 @danxuliu
 /apps/federation/appinfo/info.xml             @datenangebot
@@ -64,6 +66,10 @@ ResponseDefinitions.php @provokateurin
 /lib/public/Talk                    @nickvergessen
 /lib/public/UserStatus              @nickvergessen
 
+# Groupware
+/build/integration/dav_features/caldav.feature    @miaulalala @st3iny @SebastianKrupinski
+/build/integration/dav_features/carddav.feature   @miaulalala @st3iny @SebastianKrupinski
+
 # Personal interest
 */Activity/*                        @nickvergessen
 */Notifications/*                   @nickvergessen