diff --git a/CODEOWNERS b/CODEOWNERS
index c077858d05..06990da59c 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -19,6 +19,11 @@ functions/composer-storage-trigger @leahecole
 functions/scheduleinstance @djmailhot
 functions/speech-to-speech @ricalo
 functions/dialogflow @nnegrey
+functions/memorystore @ericschmidtatwork
+functions/spanner @jsimonweb
+
+# GCF samples outside of functions/
+datastore/functions @benwhitehead
 
 # One-offs
 cloud-sql @kurtisvg