diff --git a/CODEOWNERS b/CODEOWNERS
index 0d0cc9e4b..ef7dc9ef1 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -13,20 +13,27 @@
 # and not the global owner(s) will be requested for a review.
 
 # FPGA
-fpga                                        @n-eiling
-/lib/nodes/fpga.cpp                         @n-eiling
-/include/villas/nodes/fpga.hpp              @n-eiling
+fpga                                                @n-eiling
+/lib/nodes/fpga.cpp                                 @n-eiling
+/include/villas/nodes/fpga.hpp                      @n-eiling
+/tools/hwdef-parse.py                               @n-eiling
+/tools/fpga-*                                       @n-eiling
+/fpga                                               @n-eiling
+/etc/examples/nodes/fpga.conf                       @n-eiling
+/etc/fpga                                           @n-eiling
+/doc/openapi/components/schemas/nodes/fpga.yaml     @n-eiling
+
 
 # PMU
-/lib/nodes/libiec61850_goose.cpp            @windrad6
-/include/villas/nodes/libiec61850_goose.hpp @windrad6
-/lib/nodes/uldaq.cpp                        @windrad6
-/include/villas/nodes/uldaq.hpp             @windrad6
-/lib/dumper.cpp                             @windrad6
-/include/villas/dumper.hpp                  @windrad6
+/lib/nodes/libiec61850_goose.cpp                    @windrad6
+/include/villas/nodes/libiec61850_goose.hpp         @windrad6
+/lib/nodes/uldaq.cpp                                @windrad6
+/include/villas/nodes/uldaq.hpp                     @windrad6
+/lib/dumper.cpp                                     @windrad6
+/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/pci.hpp       @n-eiling
-/common/include/villas/kernel/vfio_*.hpp    @n-eiling
+/common/lib/kernel/pci.cpp                          @n-eiling
+/common/lib/kernel/vfi_*.cpp                        @n-eiling
+/common/include/villas/kernel/pci.hpp               @n-eiling
+/common/include/villas/kernel/vfio_*.hpp            @n-eiling