diff --git a/.gitlab/CODEOWNERS b/.gitlab/CODEOWNERS
index 5c5bed48c6a970ef6be24ec9500c25cecc346808..b49f4a2068baecbfe941b38ad267d676fe86178d 100644
--- a/.gitlab/CODEOWNERS
+++ b/.gitlab/CODEOWNERS
@@ -462,9 +462,10 @@ lib/gitlab/checks/**
# Begin rake-managed-docs-block
/doc/administration/analytics/ @lciutacu
/doc/administration/application_settings_cache.md @jglassman1
+/doc/administration/audit_event_reports.md @eread
+/doc/administration/audit_event_schema.md @eread
/doc/administration/audit_event_streaming/ @eread
-/doc/administration/audit_events.md @eread
-/doc/administration/audit_reports.md @eread
+/doc/administration/audit_event_types.md @eread
/doc/administration/auditor_users.md @jglassman1
/doc/administration/auth/ @jglassman1
/doc/administration/backup_restore/ @axil
@@ -562,6 +563,7 @@ lib/gitlab/checks/**
/doc/administration/settings/project_integration_management.md @eread @ashrafkhamis
/doc/administration/settings/push_event_activities_limit.md @msedlakjakubowski
/doc/administration/settings/rate_limit_on_issues_creation.md @msedlakjakubowski
+/doc/administration/settings/rate_limit_on_members_api.md @lciutacu
/doc/administration/settings/rate_limit_on_notes_creation.md @msedlakjakubowski
/doc/administration/settings/rate_limit_on_pipelines_creation.md @marcel.amirault @lyspin
/doc/administration/settings/rate_limit_on_projects_api.md @lciutacu
@@ -814,6 +816,7 @@ lib/gitlab/checks/**
/doc/integration/akismet.md @phillipwells
/doc/integration/arkose.md @phillipwells
/doc/integration/datadog.md @eread @ashrafkhamis
+/doc/integration/diffblue_cover.md @marcel.amirault @lyspin
/doc/integration/external-issue-tracker.md @eread @ashrafkhamis
/doc/integration/gitpod.md @ashrafkhamis
/doc/integration/gmail_action_buttons_for_gitlab.md @eread @ashrafkhamis
@@ -872,6 +875,7 @@ lib/gitlab/checks/**
/doc/user/compliance/compliance_center/ @eread
/doc/user/compliance/index.md @eread
/doc/user/custom_roles.md @jglassman1
+/doc/user/custom_roles/ @jglassman1
/doc/user/discussions/ @aqualls
/doc/user/emoji_reactions.md @msedlakjakubowski
/doc/user/enterprise_user/ @jglassman1
@@ -885,7 +889,6 @@ lib/gitlab/checks/**
/doc/user/group/epics/ @msedlakjakubowski
/doc/user/group/import/ @eread @ashrafkhamis
/doc/user/group/index.md @lciutacu
-/doc/user/group/insights/ @lciutacu
/doc/user/group/issues_analytics/ @lciutacu
/doc/user/group/iterations/ @msedlakjakubowski
/doc/user/group/manage.md @lciutacu
@@ -935,6 +938,8 @@ lib/gitlab/checks/**
/doc/user/project/index.md @lciutacu
/doc/user/project/insights/ @lciutacu
/doc/user/project/integrations/ @eread @ashrafkhamis
+/doc/user/project/integrations/beyond_identity.md @msedlakjakubowski
+/doc/user/project/integrations/git_guardian.md @msedlakjakubowski
/doc/user/project/issues/csv_import.md @eread @ashrafkhamis
/doc/user/project/members/ @lciutacu
/doc/user/project/merge_requests/ @aqualls
@@ -945,6 +950,8 @@ lib/gitlab/checks/**
/doc/user/project/merge_requests/reviews/data_usage.md @sselhorn
/doc/user/project/merge_requests/squash_and_merge.md @msedlakjakubowski
/doc/user/project/merge_requests/status_checks.md @eread
+/doc/user/project/ml/experiment_tracking/ @sselhorn
+/doc/user/project/ml/model_registry/ @sselhorn
/doc/user/project/organize_work_with_projects.md @lciutacu
/doc/user/project/releases/ @phillipwells
/doc/user/project/releases/release_evidence.md @eread
@@ -958,6 +965,7 @@ lib/gitlab/checks/**
/doc/user/project/settings/migrate_projects.md @lciutacu
/doc/user/project/settings/project_access_tokens.md @jglassman1
/doc/user/project/settings/project_features_permissions.md @lciutacu
+/doc/user/project/troubleshooting.md @lciutacu
/doc/user/project/use_project_as_go_package.md @lciutacu
/doc/user/project/web_ide/ @ashrafkhamis
/doc/user/project/working_with_projects.md @lciutacu
diff --git a/doc/subscriptions/bronze_starter.md b/doc/subscriptions/bronze_starter.md
index d69bf6b2d52732c41909880b2e94bbef7a14cd9c..12589804215ea4a93f718b64bd70a4ef6397b3a5 100644
--- a/doc/subscriptions/bronze_starter.md
+++ b/doc/subscriptions/bronze_starter.md
@@ -1,6 +1,6 @@
---
stage: Fulfillment
-group: Purchase
+group: Provision
info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
---
diff --git a/doc/subscriptions/choosing_subscription.md b/doc/subscriptions/choosing_subscription.md
index 0bf476aeff4c886689afa04620611dc1f586a03b..a332d1892484c91e3e6c8c34f24bea224e6281c0 100644
--- a/doc/subscriptions/choosing_subscription.md
+++ b/doc/subscriptions/choosing_subscription.md
@@ -1,6 +1,6 @@
---
stage: Fulfillment
-group: Purchase
+group: Subscription Management
description: Options for accessing GitLab.
info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
---
diff --git a/doc/subscriptions/community_programs.md b/doc/subscriptions/community_programs.md
index 111c097c11102223b71ba618cdad29087b677428..ca91168564819a2747e6e7d7f037aa7dd3d9e379 100644
--- a/doc/subscriptions/community_programs.md
+++ b/doc/subscriptions/community_programs.md
@@ -1,6 +1,6 @@
---
stage: Fulfillment
-group: Purchase
+group: Subscription Management
description: Education, Open Source, Startups.
info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
---
diff --git a/doc/subscriptions/customers_portal.md b/doc/subscriptions/customers_portal.md
index 865dcf99515c48c54b7032ccec6b1c247a86a3a2..4d3ff02f0cc2628cd5d2454eeb465483bdc88205 100644
--- a/doc/subscriptions/customers_portal.md
+++ b/doc/subscriptions/customers_portal.md
@@ -1,6 +1,6 @@
---
stage: Fulfillment
-group: Purchase
+group: Subscription Management
description: Payment and company details.
info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
---
diff --git a/doc/subscriptions/gitlab_com/index.md b/doc/subscriptions/gitlab_com/index.md
index 2b7283de832f92e545a6d95fb0ceacc481ee040d..9001d29e7eb41d5ff29235c9b9d88928c8d143fb 100644
--- a/doc/subscriptions/gitlab_com/index.md
+++ b/doc/subscriptions/gitlab_com/index.md
@@ -1,6 +1,6 @@
---
stage: Fulfillment
-group: Purchase
+group: Subscription Management
description: Seat usage, compute minutes, storage limits, renewal info.
info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
---
diff --git a/doc/subscriptions/index.md b/doc/subscriptions/index.md
index 4f9f1ce1f6d04b8ad50cf20922304b72da199a5f..caf0b8fb95b12b120bddcb6457662c99565a0c06 100644
--- a/doc/subscriptions/index.md
+++ b/doc/subscriptions/index.md
@@ -1,6 +1,6 @@
---
stage: Fulfillment
-group: Purchase
+group: Subscription Management
info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
---
diff --git a/doc/subscriptions/quarterly_reconciliation.md b/doc/subscriptions/quarterly_reconciliation.md
index 03c3ab102c59b5e346ddd3eb544be0403eb5d39a..fda4eafaa7aa518aef9a6492dec4a86438443386 100644
--- a/doc/subscriptions/quarterly_reconciliation.md
+++ b/doc/subscriptions/quarterly_reconciliation.md
@@ -1,6 +1,6 @@
---
stage: Fulfillment
-group: Purchase
+group: Subscription Management
description: Billing examples.
info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
---
diff --git a/lib/tasks/gitlab/tw/codeowners.rake b/lib/tasks/gitlab/tw/codeowners.rake
index 9def51c36a6a4e26fe579dad832375597520938a..e2a58bcebc1c2c18e2c9e1293a4b73ef3b701c27 100644
--- a/lib/tasks/gitlab/tw/codeowners.rake
+++ b/lib/tasks/gitlab/tw/codeowners.rake
@@ -68,7 +68,6 @@ namespace :tw do
CodeOwnerRule.new('Product Planning', '@msedlakjakubowski'),
CodeOwnerRule.new('Project Management', '@msedlakjakubowski'),
CodeOwnerRule.new('Provision', '@fneill'),
- CodeOwnerRule.new('Purchase', '@fneill'),
CodeOwnerRule.new('Redirect', 'Redirect'),
# CodeOwnerRule.new('Respond', ''),
CodeOwnerRule.new('Runner', '@fneill'),
@@ -77,6 +76,7 @@ namespace :tw do
CodeOwnerRule.new('Solutions Architecture', '@jfullam @brianwald @Darwinjs'),
CodeOwnerRule.new('Source Code', '@msedlakjakubowski'),
CodeOwnerRule.new('Static Analysis', '@rdickenson'),
+ # CodeOwnerRule.new('Subscription Management', ''),
CodeOwnerRule.new('Tenant Scale', '@lciutacu'),
CodeOwnerRule.new('Testing', '@eread'),
CodeOwnerRule.new('Threat Insights', '@rdickenson'),