diff --git a/Documentation/filesystems/OWNERS b/Documentation/filesystems/OWNERS
index 52df53b8cfd2..a63dbf4659f2 100644
--- a/Documentation/filesystems/OWNERS
+++ b/Documentation/filesystems/OWNERS
@@ -1 +1 @@
-per-file f2fs*=file:/fs/f2fs/OWNERS
+per-file f2fs**=file:/fs/f2fs/OWNERS
diff --git a/arch/arm64/OWNERS b/arch/arm64/OWNERS
index 06c8286c0bdf..f362e24fd9cf 100644
--- a/arch/arm64/OWNERS
+++ b/arch/arm64/OWNERS
@@ -1,7 +1,4 @@
-per-file crypto/*=file:/crypto/OWNERS
-per-file include/*=mzyngier@google.com,willdeacon@google.com
-per-file kernel/*=mzyngier@google.com,willdeacon@google.com
-per-file kvm/*=mzyngier@google.com,willdeacon@google.com
-per-file lib/*=mzyngier@google.com,willdeacon@google.com
-per-file mm/*=file:/mm/OWNERS
-per-file net/*=file:/net/OWNERS
+per-file crypto/**=file:/crypto/OWNERS
+per-file {include,kernel,kvm,lib}/**=mzyngier@google.com,willdeacon@google.com
+per-file mm/**=file:/mm/OWNERS
+per-file net/**=file:/net/OWNERS
diff --git a/arch/x86/OWNERS b/arch/x86/OWNERS
index fdee0d6dd07e..f59fa995b361 100644
--- a/arch/x86/OWNERS
+++ b/arch/x86/OWNERS
@@ -1,3 +1,3 @@
-per-file crypto/*=file:/crypto/OWNERS
-per-file mm/*=file:/mm/OWNERS
-per-file net/*=file:/net/OWNERS
+per-file crypto/**=file:/crypto/OWNERS
+per-file mm/**=file:/mm/OWNERS
+per-file net/**=file:/net/OWNERS
diff --git a/drivers/OWNERS b/drivers/OWNERS
index 613541089922..c13fa056367d 100644
--- a/drivers/OWNERS
+++ b/drivers/OWNERS
@@ -1,7 +1,6 @@
-per-file base/*=gregkh@google.com,saravanak@google.com
-per-file block/*=akailash@google.com
-per-file md/*=akailash@google.com,palmerdabbelt@google.com,paullawrence@google.com
-per-file net/*=file:/net/OWNERS
+per-file base/**=gregkh@google.com,saravanak@google.com
+per-file block/**=akailash@google.com
+per-file md/**=akailash@google.com,paullawrence@google.com
+per-file net/**=file:/net/OWNERS
 per-file scsi/**=bvanassche@google.com,jaegeuk@google.com
-per-file tty/*=gregkh@google.com
-per-file usb/*=gregkh@google.com
+per-file {tty,usb}/**=gregkh@google.com
diff --git a/fs/OWNERS b/fs/OWNERS
index 09d26b6cd7ae..7780f6be0335 100644
--- a/fs/OWNERS
+++ b/fs/OWNERS
@@ -1,2 +1 @@
-per-file crypto/*=ebiggers@google.com
-per-file verity/*=ebiggers@google.com
+per-file {crypto,verity}/**=ebiggers@google.com
diff --git a/include/OWNERS b/include/OWNERS
index ca3b4045a095..4b815c212f9d 100644
--- a/include/OWNERS
+++ b/include/OWNERS
@@ -1 +1 @@
-per-file net=file:/net/OWNERS
+per-file net/**=file:/net/OWNERS
diff --git a/include/linux/OWNERS b/include/linux/OWNERS
index d5613e51cf80..68b6dedea64f 100644
--- a/include/linux/OWNERS
+++ b/include/linux/OWNERS
@@ -1,4 +1,4 @@
 per-file bio.h=file:/block/OWNERS
 per-file blk*.h=file:/block/OWNERS
-per-file f2fs*=file:/fs/f2fs/OWNERS
-per-file net*=file:/net/OWNERS
+per-file f2fs**=file:/fs/f2fs/OWNERS
+per-file net**=file:/net/OWNERS
diff --git a/include/trace/events/OWNERS b/include/trace/events/OWNERS
index 52df53b8cfd2..a63dbf4659f2 100644
--- a/include/trace/events/OWNERS
+++ b/include/trace/events/OWNERS
@@ -1 +1 @@
-per-file f2fs*=file:/fs/f2fs/OWNERS
+per-file f2fs**=file:/fs/f2fs/OWNERS
diff --git a/include/uapi/linux/OWNERS b/include/uapi/linux/OWNERS
index d2c6def097c3..8aed640a4679 100644
--- a/include/uapi/linux/OWNERS
+++ b/include/uapi/linux/OWNERS
@@ -1,3 +1,3 @@
-per-file f2fs*=file:/fs/f2fs/OWNERS
-per-file fuse*=file:/fs/fuse/OWNERS
-per-file net*=file:/net/OWNERS
+per-file f2fs**=file:/fs/f2fs/OWNERS
+per-file fuse**=file:/fs/fuse/OWNERS
+per-file net**=file:/net/OWNERS