diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index b43959b3477..baa010bd0f8 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,35 +1,7 @@
-# Default code owner
-*       @ornias1993
-
-# Apps maintained by ornias1993
-sonarr/	@ornias1993
-radarr/	@ornias1993
-traefik/	@ornias1993
-plex/	@ornias1993
-lidarr/	@ornias1993
-jackett/	@ornias1993
-kms/	@ornias1993
-ombi/	@ornias1993
-transmission/	@ornias1993
-tautulli/	@ornias1993
-
-# Apps maintained by tprelog
-esphome/	@tprelog
-zwavejs2mqtt/	@tprelog
-home-assistant/	@tprelog
-
-# Apps maintained by stavros-k
-handbrake/	@stavros-k
-collabora-online/	@stavros-k
-deepstack-cpu/ @stavros-k
-
-# Apps maintained by djs52
-emby/ @djs52
-
-# Apps maintained by luuknieuwdorp
-syncthing/ @luuknieuwdorp
-
-# Apps maintained by warllo54
-appdaemon/ @warllo54
-podgrab/ @warllo54
-fireflyiii/ @warllo54
+# Default code owners
+*      @ornias1993
+/charts/stable/     @ornias1993 @stavros-k
+/charts/incubator/      @ornias1993
+/docs/      @ornias1993 @stavros-k
+/promo/      @ornias1993 @stavros-k
+/containers/      @ornias1993