diff --git a/cryptohome/OWNERS b/cryptohome/OWNERS
index ffcba78..f63174e 100644
--- a/cryptohome/OWNERS
+++ b/cryptohome/OWNERS
@@ -4,22 +4,10 @@
 mnissler@chromium.org
 zuan@chromium.org
 
-# Owners of file system related code.
-per-file *homedirs*=oka@chromium.org
-per-file *homedirs*=gwendal@chromium.org
-per-file *homedirs*=hashimoto@chromium.org
-
 per-file platform*=gwendal@chromium.org
 per-file platform*=hashimoto@chromium.org
 
-per-file storage/disk_cleanup*=gwendal@chromium.org
-per-file storage/disk_cleanup*=hashimoto@chromium.org
 per-file dircrypto_util*=gwendal@chromium.org
 per-file dircrypto_util*=hashimoto@chromium.org
 
-# Files related to mount/unmount operations, including out-of-process mounts.
-per-file storage/mount*=jorgelo@chromium.org
-per-file storage/mount*=gwendal@chromium.org
-per-file storage/mount*=hashimoto@chromium.org
-per-file storage/out_of_process*=jorgelo@chromium.org
 per-file user_session*=dlunev@chromium.org
diff --git a/cryptohome/storage/OWNERS b/cryptohome/storage/OWNERS
new file mode 100644
index 0000000..1a6659b
--- /dev/null
+++ b/cryptohome/storage/OWNERS
@@ -0,0 +1,6 @@
+dlunev@chromium.org
+gwendal@chromium.org
+hashimoto@chromium.org
+jorgelo@chromium.org
+oka@chromium.org
+sarthakkukreti@chromium.org