diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 2e097f35..76ddc946 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,14 +1,2 @@
-# Default
-*                                     @tillkruss
-
-# Redis commands
-src/Command/Redis/*                   @predis/team @tillkruss
-
-# Redis Stack
-src/Command/Redis/Json/*              @predis/team
-src/Command/Redis/Search/*            @predis/team
-src/Command/Redis/TopK/*              @predis/team
-src/Command/Redis/TDigest/*           @predis/team
-src/Command/Redis/BloomFilter/*       @predis/team
-src/Command/Redis/CuckooFilter/*      @predis/team
-src/Command/Redis/CountMinSketch/*    @predis/team
+*                         @predis/maintainers
+src/Relay*                @tillkruss