diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 6708e6dbb..5eb099f61 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -8,7 +8,7 @@
 /* @microsoft/driver-samples-maintainers
 
 # Audio
-/audio @microsoft/windowsaudio
+/audio/ @microsoft/windowsaudio
 
 # Bluetooth
 /bluetooth/ @microsoft/bluetooth
@@ -33,24 +33,38 @@
 /smartcrd/ @microsoft/consumer-storage
 
 # Device Enumeration and Interconnect
-/gpio @microsoft/device-enumeration-and-interconnect
-/prm @microsoft/device-enumeration-and-interconnect
+/gpio/ @microsoft/device-enumeration-and-interconnect
+/pofx/PEP/ @microsoft/device-enumeration-and-interconnect
+/prm/ @microsoft/device-enumeration-and-interconnect
+/wmi/wmiacpi/ @microsoft/device-enumeration-and-interconnect
+
+# Display Kernel
+/video/ @microsoft/display-kernel-devs
+
+# Driver Development Supplemental Tools
+/tools/ @microsoft/windows-driver-developers-supplemental-tools-admins
+
+# Energy Efficiency
+/pofx/WDF/ @microsoft/ee-devs
+/simbatt/ @microsoft/ee-devs
+/thermal/ @microsoft/ee-devs
 
 # Event Tracing for Windows
 /general/perfcounters/ @microsoft/etw
 /general/tracing/ @microsoft/etw
 
+# File Systems
+/filesys/cdfs/ @microsoft/filesystems
+/filesys/fastfat/ @microsoft/filesystems
+
 # Filter Manager
 /filesys/miniFilter/ @microsoft/filter-manager
 
-# Indirect Display
-/video/IndirectDisplay/ @microsoft/indirectdisplay-devs
-
 # Kernel Core
 /general/registry/ @microsoft/kernel-core
 
 # Network Security
-/network/trans @microsoft/netsec
+/network/trans/ @microsoft/netsec
 
 # Platform Integrity
 /security/ @microsoft/platform-integrity