diff --git a/CODEOWNERS b/CODEOWNERS
index 47d9337c66..570a2910e5 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -65,9 +65,18 @@
 # cloudwatch
 /content/en/user-guide/aws/cloudwatch/ @pinzon @steffyP
 
+# codebuild
+/content/en/user-guide/aws/codebuild/ @giograno
+
 # codecommit
 /content/en/user-guide/aws/codecommit/ @silv-io
 
+# codedeploy
+/content/en/user-guide/aws/codedeploy/ @viren-nadkarni
+
+# codepipeline
+/content/en/user-guide/aws/codepipeline/ @giograno @viren-nadkarni
+
 # dms
 /content/en/user-guide/aws/dms/ @sannya-singal @cloutierMat @bentsku @steffyP