diff --git a/CODEOWNERS b/CODEOWNERS
index 0512aa1bf..8b3d844f9 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -27,7 +27,5 @@ fpga                                                @n-eiling
 /include/villas/dumper.hpp                          @windrad6
 
 # VFIO related files
-/common/lib/kernel/pci.cpp                          @n-eiling
-/common/lib/kernel/vfi_*.cpp                        @n-eiling
-/common/include/villas/kernel/devices/*             @n-eiling
-/common/include/villas/kernel/vfio_*.hpp            @n-eiling
+/common/lib/kernel                                  @n-eiling
+/common/include/villas/kernel                       @n-eiling