diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 16331b65e52..c1de8a529a8 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -326,3 +326,8 @@ Modules/_xxtestfuzz/          @ammaraskar
 **/*templateobject*           @lysnikolaou
 **/*templatelib*              @lysnikolaou
 **/*tstring*                  @lysnikolaou
+
+# Remote debugging
+Python/remote_debug.h         @pablogsal
+Python/remote_debugging.c     @pablogsal
+Modules/_remote_debugging_module.c @pablogsal @ambv @1st1