1 files changed, 12 insertions, 11 deletions
diff --git a/lib/tasks/gitlab/tw/codeowners.rake b/lib/tasks/gitlab/tw/codeowners.rake
index 358bc6c31eb..0aed017c84a 100644
--- a/lib/tasks/gitlab/tw/codeowners.rake
+++ b/lib/tasks/gitlab/tw/codeowners.rake
@@ -12,17 +12,16 @@ namespace :tw do
       CodeOwnerRule.new("Adoption", '@kpaizee'),
       CodeOwnerRule.new('Activation', '@kpaizee'),
       CodeOwnerRule.new('Adoption', '@kpaizee'),
-      CodeOwnerRule.new('APM', '@ngaskill'),
-      CodeOwnerRule.new('Authentication & Authorization', '@eread'),
+      CodeOwnerRule.new('Authentication and Authorization', '@eread'),
       CodeOwnerRule.new('Certify', '@msedlakjakubowski'),
       CodeOwnerRule.new('Code Review', '@aqualls'),
       CodeOwnerRule.new('Compliance', '@eread'),
       CodeOwnerRule.new('Composition Analysis', '@rdickenson'),
       CodeOwnerRule.new('Configure', '@marcia'),
-      CodeOwnerRule.new('Container Security', '@ngaskill'),
+      CodeOwnerRule.new('Container Security', '@claytoncornell'),
       CodeOwnerRule.new('Contributor Experience', '@eread'),
       CodeOwnerRule.new('Conversion', '@kpaizee'),
-      CodeOwnerRule.new('Database', '@aqualls'),
+      CodeOwnerRule.new('Database', '@marcia'),
       CodeOwnerRule.new('Development', '@marcia'),
       CodeOwnerRule.new('Distribution', '@axil'),
       CodeOwnerRule.new('Distribution (Charts)', '@axil'),
@@ -37,26 +36,28 @@ namespace :tw do
       CodeOwnerRule.new('Geo', '@axil'),
       CodeOwnerRule.new('Gitaly', '@eread'),
       CodeOwnerRule.new('Global Search', '@marcia'),
-      CodeOwnerRule.new('Health', '@ngaskill'),
-      CodeOwnerRule.new('Import', '@ngaskill'),
+      CodeOwnerRule.new('Import', '@eread'),
       CodeOwnerRule.new('Infrastructure', '@marcia'),
       CodeOwnerRule.new('Integrations', '@kpaizee'),
       CodeOwnerRule.new('Knowledge', '@aqualls'),
       CodeOwnerRule.new('License', '@sselhorn'),
       CodeOwnerRule.new('Memory', '@marcia'),
-      CodeOwnerRule.new('Monitor', '@ngaskill'),
+      CodeOwnerRule.new('Monitor', '@msedlakjakubowski'),
+      CodeOwnerRule.new('Observability', 'msedlakjakubowski'),
       CodeOwnerRule.new('Optimize', '@fneill'),
-      CodeOwnerRule.new('Package', '@ngaskill'),
+      CodeOwnerRule.new('Package', '@claytoncornell'),
       CodeOwnerRule.new('Pipeline Authoring', '@marcel.amirault'),
       CodeOwnerRule.new('Pipeline Execution', '@marcel.amirault'),
+      CodeOwnerRule.new('Pipeline Insights', '@marcel.amirault'),
       CodeOwnerRule.new('Portfolio Management', '@msedlakjakubowski'),
-      CodeOwnerRule.new('Product Intelligence', '@fneill'),
+      CodeOwnerRule.new('Product Intelligence', '@claytoncornell'),
       CodeOwnerRule.new('Product Planning', '@msedlakjakubowski'),
       CodeOwnerRule.new('Project Management', '@msedlakjakubowski'),
       CodeOwnerRule.new('Provision', '@sselhorn'),
       CodeOwnerRule.new('Purchase', '@sselhorn'),
       CodeOwnerRule.new('Redirect', 'Redirect'),
       CodeOwnerRule.new('Release', '@rdickenson'),
+      CodeOwnerRule.new('Respond', '@msedlakjakubowski'),
       CodeOwnerRule.new('Runner', '@sselhorn'),
       CodeOwnerRule.new('Sharding', '@marcia'),
       CodeOwnerRule.new('Source Code', '@aqualls'),
@@ -64,9 +65,9 @@ namespace :tw do
       CodeOwnerRule.new('Static Site Editor', '@aqualls'),
       CodeOwnerRule.new('Style Guide', '@sselhorn'),
       CodeOwnerRule.new('Testing', '@eread'),
-      CodeOwnerRule.new('Threat Insights', '@fneill'),
+      CodeOwnerRule.new('Threat Insights', '@claytoncornell'),
       CodeOwnerRule.new('Utilization', '@sselhorn'),
-      CodeOwnerRule.new('Vulnerability Research', '@fneill'),
+      CodeOwnerRule.new('Vulnerability Research', '@claytoncornell'),
       CodeOwnerRule.new('Workspace', '@fneill')
     ].freeze