diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 1e635749b1e..a503eb49031 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -25,10 +25,10 @@
 /xml/System.Activities*/ @dotnet/docs
 /xml/System.AddIn*/ @dotnet/docs
 /xml/System.ComponentModel.DataAnnotations*/ @ajcvickers
-/xml/System.Data*/ @ajcvickers @david-engel @JRahnama
+/xml/System.Data*/ @ajcvickers
 /xml/System.Data.Odbc/ @ajcvickers
 /xml/System.Data.OleDb/ @ajcvickers
-/xml/System.Data.SqlClient/ @david-engel @JRahnama
+/xml/System.Data.SqlClient/ @david-engel @cheenamalhotra
 /xml/System.Deployment*/ @dotnet/docs
 /xml/System.Device*/ @dotnet/docs
 /xml/System.Dynamic*/ @dotnet/docs
diff --git a/.github/policies/mention-owners.yml b/.github/policies/mention-owners.yml
index 44a4dca48d3..26cbeaab3af 100644
--- a/.github/policies/mention-owners.yml
+++ b/.github/policies/mention-owners.yml
@@ -391,9 +391,8 @@ configuration:
             then:
               - mentionUsers:
                   mentionees:
-                    - davoudeshtehari
+                    - cheenamalhotra
                     - david-engel
-                    - jrahnama
                   replyTemplate: >-
                     Tagging subscribers to this area: ${mentionees}
                   assignMentionees: False