diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index bfad325e6..42bb40765 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -7,3 +7,6 @@ tests/xen/ @xcp-ng/os-platform-release @xcp-ng/hypervisor-kernel
 
 tests/xapi/ @xcp-ng/os-platform-release @xcp-ng/xapi-network
 tests/network/ @xcp-ng/os-platform-release @xcp-ng/xapi-network
+
+tests/guest_tools/win @xcp-ng/os-platform-release @xcp-ng/windows-guest-tools
+lib/windows @xcp-ng/os-platform-release @xcp-ng/windows-guest-tools