diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index f164cf3c14a3..ac031e4fccbc 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -265,12 +265,12 @@
 /sdk/healthdataaiservices/    @alexathomases @Azure/healthdatadeidentification
 
 # PRLabel: %Hosted Agents
-/sdk/agentserver/    @ankitbko @vangarp @RaviPidaparthi
+/sdk/agentserver/    @Shivakishore14 @ankitbko @vangarp @RaviPidaparthi
 # PRLabel: %Hosted Agents
 /sdk/agentserver/azure-ai-agentserver-ghcopilot/    @jodeklotzms @pradeepkintali @tendau @ganeshyb @code-vicar
 
 # ServiceLabel: %Hosted Agents
-# ServiceOwners: @ankitbko @vangarp @RaviPidaparthi
+# ServiceOwners: @Shivakishore14 @ankitbko @vangarp @RaviPidaparthi
 
 # ServiceLabel: %Image Analysis %Service Attention
 # PRLabel: %Image Analysis