diff --git a/CODEOWNERS b/CODEOWNERS
index 97ab2b6fd68..9ab6a35ae68 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1 +1,6 @@
-*	@labkode
+*				@labkode @ishank011
+pkg/storage/fs/owncloudsql	@cs3org/owncloud-team
+pkg/storage/fs/owncloud   	@cs3org/owncloud-team
+pkg/storage/fs/ocis		@cs3org/owncloud-team
+pkg/user/manager/owncloudsql	@cs3org/owncloud-team
+pkg/app           		@wkloucek @glpatcern @ishank011