diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 11229371253..9532f3159b1 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -2,32 +2,32 @@
 *    @terraform-providers/aws-provider
 
 # Service specific owners
-/aws/*_aws_fsx_*.go     @drfaust92
-/website/**/fsx*        @drfaust92
+/aws/*apigatewayv2*    @ewbankkit @terraform-providers/aws-provider
+/website/**/apigatewayv2*    @ewbankkit @terraform-providers/aws-provider
 
-/aws/*_aws_codeartifact_*.go     @drfaust92
-/website/**/codeartifact*        @drfaust92
+/aws/*appmesh*    @ewbankkit @terraform-providers/aws-provider
+/website/**/appmesh*    @ewbankkit @terraform-providers/aws-provider
 
-/aws/*_aws_storagegateway_*.go     @drfaust92
-/website/**/storagegateway*        @drfaust92
+/aws/*backup*    @ewbankkit @terraform-providers/aws-provider
+/website/**/backup*    @ewbankkit @terraform-providers/aws-provider
 
-/aws/*_aws_sagemaker_*.go     @drfaust92
-/website/**/sagemaker*        @drfaust92
+/aws/*_aws_codeartifact_*.go     @DrFaust92 @terraform-providers/aws-provider
+/website/**/codeartifact*        @DrFaust92 @terraform-providers/aws-provider
 
-/aws/*_aws_glue_*.go     @drfaust92
-/website/**/glue*        @drfaust92
+/aws/*_aws_fsx_*.go     @DrFaust92 @terraform-providers/aws-provider
+/website/**/fsx*        @DrFaust92 @terraform-providers/aws-provider
 
-/aws/*apigatewayv2*    @ewbankkit
-/website/**/apigatewayv2*    @ewbankkit
+/aws/*globalaccelerator*    @ewbankkit @terraform-providers/aws-provider
+/website/**/globalaccelerator*    @ewbankkit @terraform-providers/aws-provider
 
-/aws/*appmesh*    @ewbankkit
-/website/**/appmesh*    @ewbankkit
+/aws/*_aws_glue_*.go     @DrFaust92 @terraform-providers/aws-provider
+/website/**/glue*        @DrFaust92 @terraform-providers/aws-provider
 
-/aws/*backup*    @ewbankkit
-/website/**/backup*    @ewbankkit
+/aws/*route53_resolver*    @ewbankkit @terraform-providers/aws-provider
+/website/**/route53_resolver*    @ewbankkit @terraform-providers/aws-provider
 
-/aws/*globalaccelerator*    @ewbankkit
-/website/**/globalaccelerator*    @ewbankkit
+/aws/*_aws_storagegateway_*.go     @DrFaust92 @terraform-providers/aws-provider
+/website/**/storagegateway*        @DrFaust92 @terraform-providers/aws-provider
 
-/aws/*route53_resolver*    @ewbankkit
-/website/**/route53_resolver*    @ewbankkit
+/aws/*_aws_sagemaker_*.go     @DrFaust92 @terraform-providers/aws-provider
+/website/**/sagemaker*        @DrFaust92 @terraform-providers/aws-provider