diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 47eb5c354d..39d901e790 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -7,5 +7,5 @@
 
 # The api-spanner-python team is the default owner for anything not
 # explicitly taken by someone else.
-*                               @googleapis/api-spanner-python
-/samples/                       @googleapis/api-spanner-python @googleapis/python-samples-owners
\ No newline at end of file
+*                               @googleapis/api-spanner-python @googleapis/yoshi-python
+/samples/                       @googleapis/api-spanner-python @googleapis/python-samples-owners