diff --git a/CODEOWNERS b/CODEOWNERS
index 97ab2b6fd6..9ab6a35ae6 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
diff --git a/changelog/unreleased/codeowners.md b/changelog/unreleased/codeowners.md
new file mode 100644
index 0000000000..5cb2735504
--- /dev/null
+++ b/changelog/unreleased/codeowners.md
@@ -0,0 +1,3 @@
+Enhancement: Update CODEOWNERS
+
+https://github.com/cs3org/reva/pull/2190