diff --git a/CODEOWNERS b/CODEOWNERS
index e878e258e1..07b4a48f24 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -7,13 +7,15 @@
 
 # Kokoro
 .kokoro @fhinkel
-.kokoro/appengine @michaelawyu
+.kokoro/appengine @GoogleCloudPlatform/cdpe-serverless
 .kokoro/functions @ace-n @grant
 
 # Serverless/CBR
-appengine @michaelawyu
+appengine @GoogleCloudPlatform/cdpe-serverless
 functions @ace-n @grant
-run @GoogleCloudPlatform/cdpe-cbr-containers
+run @GoogleCloudPlatform/cdpe-serverless
+eventarc @GoogleCloudPlatform/cdpe-serverless
+workflows @GoogleCloudPlatform/cdpe-serverless
 
 # Other functions samples
 functions/scheduleinstance @askmeegs