diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index fa1bf09ad..ac032fe5e 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,12 +1,10 @@
-/*/groupware/                                               @ChristophWurst
-/*/groupware/calendar.rst                                   @miaulalala
-/*/groupware/contacts.rst                                   @hamza221
-/*/groupware/mail.rst                                       @GretaD
+/*/groupware/calendar.rst                                   @SebastianKrupinski @st3iny @tcitworld
+/*/groupware/contacts.rst                                   @GVodyanov @hamza221 @SebastianKrupinski
+/*/groupware/mail.rst                                       @ChristophWurst @GretaD @kesselb
 /*/security.rst                                             @nickvergessen
 /admin_manual/configuration_database                        @nickvergessen
 /admin_manual/file_workflows                                @nickvergessen
 /developer_manual/client_apis/OCS/ocs-status-api.rst        @Antreesy @nickvergessen
-/developer_manual/digging_deeper/groupware/                 @ChristophWurst
-/developer_manual/digging_deeper/groupware/calendar.rst     @miaulalala
+/developer_manual/digging_deeper/groupware/calendar.rst     @SebastianKrupinski @st3iny @tcitworld
 /developer_manual/digging_deeper/talk.rst                   @nickvergessen
 /user_manual/talk/                                          @Antreesy @DorraJaouad @nickvergessen