diff --git a/CODEOWNERS b/CODEOWNERS
index 63a17be22c..2518b6475a 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1,2 +1,2 @@
 *	@qmk/collaborators
-/lib/python/*	@skullydazed @erovia
+/lib/python/*	@qmk/python
diff --git a/lib/python/qmk/cli/ping/maintainers.py b/lib/python/qmk/cli/ping/maintainers.py
index 83bc6b224d..89faaf3b27 100644
--- a/lib/python/qmk/cli/ping/maintainers.py
+++ b/lib/python/qmk/cli/ping/maintainers.py
@@ -16,7 +16,7 @@ def ping_maintainers(cli):
 
     for file in cli.args.files:
         for maintainer in maintainers(file):
-            if maintainer != 'qmk/collaborators':
+            if not maintainer.startswith('@qmk/'):
                 github_maintainers.add(maintainer)
 
     if github_maintainers: