diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index f3f8e1df41688..07eb5c9eb6a3c 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -25,7 +25,7 @@ package-lock.json                             @nextcloud/server-dependabot
 
 # App maintainers
 /apps/admin_audit/appinfo/info.xml            @luka-nextcloud @samin-z
-/apps/cloud_federation_api/appinfo/info.xml   @nfebe @mejo-
+/apps/cloud_federation_api/appinfo/info.xml   @mejo-
 /apps/comments/appinfo/info.xml               @edward-ly @sorbaugh
 /apps/contactsinteraction/appinfo/info.xml    @kesselb @SebastianKrupinski
 /apps/contactsinteraction/lib                 @kesselb @SebastianKrupinski
@@ -37,11 +37,11 @@ package-lock.json                             @nextcloud/server-dependabot
 /apps/dav/tests/unit/CardDAV                  @hamza221 @SebastianKrupinski
 /apps/encryption/appinfo/info.xml             @come-nc @icewind1991
 /apps/federatedfilesharing/appinfo/info.xml   @icewind1991 @danxuliu
-/apps/federation/appinfo/info.xml             @nfebe @sorbaugh
-/apps/files/appinfo/info.xml                  @skjnldsv @icewind1991 @szaimen @susnux @nfebe
+/apps/federation/appinfo/info.xml             @sorbaugh
+/apps/files/appinfo/info.xml                  @skjnldsv @icewind1991 @szaimen @susnux
 /apps/files_external/appinfo/info.xml         @icewind1991 @artonge
 /apps/files_reminders/appinfo/info.xml        @skjnldsv @sorbaugh
-/apps/files_sharing/appinfo/info.xml          @skjnldsv @provokateurin @nfebe
+/apps/files_sharing/appinfo/info.xml          @skjnldsv @provokateurin
 /apps/files_trashbin/appinfo/info.xml         @icewind1991 @sorbaugh
 /apps/files_versions/appinfo/info.xml         @artonge @icewind1991
 /apps/oauth2/appinfo/info.xml                 @julien-nc @ChristophWurst