diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 563195769e..06fb3e7316 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,15 +1,15 @@
 /packages/create-plugin/ @grafana/grafana-frontend-platform
-/packages/eslint-plugin-plugins/ @grafana/plugins-platform-frontend
-/packages/plugin-docs-parser/ @grafana/plugins-platform-frontend
-/packages/plugin-docs-cli/ @grafana/plugins-platform-frontend
-/packages/plugin-e2e/ @grafana/plugins-platform-frontend
-/packages/plugin-types-bundler/ @grafana/plugins-platform-frontend
+/packages/eslint-plugin-plugins/ @grafana/grafana-catalog
+/packages/plugin-docs-parser/ @grafana/grafana-catalog
+/packages/plugin-docs-cli/ @grafana/grafana-catalog
+/packages/plugin-e2e/ @grafana/grafana-catalog
+/packages/plugin-types-bundler/ @grafana/grafana-catalog
 /packages/react-detect/ @grafana/grafana-frontend-platform
-/packages/sign-plugin/ @grafana/plugins-platform-frontend
+/packages/sign-plugin/ @grafana/grafana-catalog
 /packages/tsconfig/ @grafana/grafana-frontend-platform
 
 /docusaurus/website/ @grafana/grafana-frontend-platform @grafana/docs-plugins
 /docusaurus/docs/ @grafana/grafana-frontend-platform @grafana/docs-plugins
 
-/.github/workflows/playwright.yml @grafana/plugins-platform-frontend
-/.github/workflows/playwright-nightly.yml @grafana/plugins-platform-frontend
+/.github/workflows/playwright.yml @grafana/grafana-catalog
+/.github/workflows/playwright-nightly.yml @grafana/grafana-catalog
diff --git a/.github/renovate.json b/.github/renovate.json
index 2bcc8845f4..b2a26063d0 100644
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -23,7 +23,7 @@
   ],
   "separateMajorMinor": false,
   "skipInstalls": false,
-  "reviewers": ["team:grafana/plugins-platform-frontend"],
+  "reviewers": ["team:grafana/grafana-catalog"],
   "enabledManagers": ["custom.regex", "npm", "github-actions"],
   "github-actions": {
     "managerFilePatterns": [
diff --git a/packages/plugin-e2e/CONTRIBUTING.md b/packages/plugin-e2e/CONTRIBUTING.md
index bcb6eaa892..292341a629 100644
--- a/packages/plugin-e2e/CONTRIBUTING.md
+++ b/packages/plugin-e2e/CONTRIBUTING.md
@@ -125,6 +125,6 @@ yarn add @grafana/plugin-e2e@0.3.0-canary.623.aedff75.0
 yarn e2e:plugin
 ```
 
-6. If all tests pass in `grafana/grafana` and the PR in `grafana/plugin-tools` is approved, tag `@grafana/plugins-platform-frontend` and ask them to merge the PR.
+6. If all tests pass in `grafana/grafana` and the PR in `grafana/plugin-tools` is approved, tag `@grafana/grafana-catalog` and ask them to merge the PR.
 
 7. Once the PR is merged, `auto` will publish a patch/minor release to npm. Then you discard changes from step 5, and can go ahead and install the new release of @grafana/plugin-e2e in grafana/grafana.