diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 299a8fe09bb76..c968d2546137d 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -3,10 +3,10 @@
 # is the same as .gitignore.
 
 # The owners for all files in the repo.
-* @googleapis/cloud-cxx-owners
+* @googleapis/cloud-sdk-cpp-team
 
 # These libraries are also owned by the GCS clients team.
-/google/cloud/storage/ @googleapis/gcs-sdk-team @googleapis/cloud-cxx-owners
-/google/cloud/storagecontrol/ @googleapis/gcs-sdk-team @googleapis/cloud-cxx-owners
-/google/cloud/storageinsights/ @googleapis/gcs-sdk-team @googleapis/cloud-cxx-owners
-/google/cloud/storagetransfer/ @googleapis/gcs-sdk-team @googleapis/cloud-cxx-owners
+/google/cloud/storage/ @googleapis/gcs-sdk-team @googleapis/cloud-sdk-cpp-team
+/google/cloud/storagecontrol/ @googleapis/gcs-sdk-team @googleapis/cloud-sdk-cpp-team
+/google/cloud/storageinsights/ @googleapis/gcs-sdk-team @googleapis/cloud-sdk-cpp-team
+/google/cloud/storagetransfer/ @googleapis/gcs-sdk-team @googleapis/cloud-sdk-cpp-team