diff --git a/pkg/kindsysreport/codegen/report.json b/pkg/kindsysreport/codegen/report.json
index e760dbf9170..1d2de33f505 100644
--- a/pkg/kindsysreport/codegen/report.json
+++ b/pkg/kindsysreport/codegen/report.json
@@ -1,5 +1,36 @@
 {
   "kinds": {
+    "accesspolicy": {
+      "category": "core",
+      "codeowners": [
+        "grafana/grafana-as-code",
+        "grafana/grafana-frontend-platform",
+        "grafana/plugins-platform-frontend"
+      ],
+      "crd": {
+        "dummySchema": false,
+        "group": "accesspolicy.core.grafana.com",
+        "scope": "Namespaced"
+      },
+      "currentVersion": [
+        0,
+        0
+      ],
+      "description": "Access rules for a scope+role.  NOTE there is a unique constraint on role+scope",
+      "grafanaMaturityCount": 0,
+      "lineageIsGroup": false,
+      "links": {
+        "docs": "https://grafana.com/docs/grafana/next/developers/kinds/core/accesspolicy/schema-reference",
+        "go": "https://github.com/grafana/grafana/tree/main/pkg/kinds/accesspolicy",
+        "schema": "https://github.com/grafana/grafana/tree/main/kinds/accesspolicy/accesspolicy_kind.cue",
+        "ts": "https://github.com/grafana/grafana/tree/main/packages/grafana-schema/src/raw/accesspolicy/x/accesspolicy_types.gen.ts"
+      },
+      "machineName": "accesspolicy",
+      "maturity": "merged",
+      "name": "AccessPolicy",
+      "pluralMachineName": "accesspolicies",
+      "pluralName": "AccessPolicies"
+    },
     "alertgroupspanelcfg": {
       "category": "composable",
       "codeowners": [
@@ -93,7 +124,7 @@
     "annotationslistpanelcfg": {
       "category": "composable",
       "codeowners": [
-        "grafana/user-essentials"
+        "grafana/grafana-frontend-platform"
       ],
       "currentVersion": [
         0,
@@ -235,7 +266,7 @@
     "cloudwatchdataquery": {
       "category": "composable",
       "codeowners": [
-        "grafana/aws-plugins"
+        "grafana/aws-datasources"
       ],
       "currentVersion": [
         0,
@@ -250,7 +281,7 @@
         "ts": "https://github.com/grafana/grafana/tree/main/public/app/plugins/datasource/cloudwatch/dataquery.gen.ts"
       },
       "machineName": "cloudwatchdataquery",
-      "maturity": "merged",
+      "maturity": "experimental",
       "name": "CloudWatchDataQuery",
       "pluralMachineName": "cloudwatchdataquerys",
       "pluralName": "CloudWatchDataQuerys",
@@ -281,10 +312,9 @@
     "dashboard": {
       "category": "core",
       "codeowners": [
-        "grafana/dataviz-squad",
         "grafana/grafana-as-code",
-        "grafana/plugins-platform-frontend",
-        "grafana/user-essentials"
+        "grafana/grafana-frontend-platform",
+        "grafana/plugins-platform-frontend"
       ],
       "crd": {
         "dummySchema": true,
@@ -296,7 +326,7 @@
         0
       ],
       "description": "A Grafana dashboard.",
-      "grafanaMaturityCount": 140,
+      "grafanaMaturityCount": 260,
       "lineageIsGroup": false,
       "links": {
         "docs": "https://grafana.com/docs/grafana/next/developers/kinds/core/dashboard/schema-reference",
@@ -357,7 +387,7 @@
     "dashboardlistpanelcfg": {
       "category": "composable",
       "codeowners": [
-        "grafana/user-essentials"
+        "grafana/grafana-frontend-platform"
       ],
       "currentVersion": [
         0,
@@ -378,6 +408,30 @@
       "pluralName": "DashboardListPanelCfgs",
       "schemaInterface": "PanelCfg"
     },
+    "datagridpanelcfg": {
+      "category": "composable",
+      "codeowners": [
+        "grafana/grafana-bi-squad"
+      ],
+      "currentVersion": [
+        0,
+        0
+      ],
+      "grafanaMaturityCount": 0,
+      "lineageIsGroup": true,
+      "links": {
+        "docs": "https://grafana.com/docs/grafana/next/developers/kinds/composable/datagridpanelcfg/schema-reference",
+        "go": "n/a",
+        "schema": "https://github.com/grafana/grafana/tree/main/public/app/plugins/panel/datagrid/panelcfg.cue",
+        "ts": "https://github.com/grafana/grafana/tree/main/public/app/plugins/panel/datagrid/panelcfg.gen.ts"
+      },
+      "machineName": "datagridpanelcfg",
+      "maturity": "experimental",
+      "name": "DatagridPanelCfg",
+      "pluralMachineName": "datagridpanelcfgs",
+      "pluralName": "DatagridPanelCfgs",
+      "schemaInterface": "PanelCfg"
+    },
     "datasource": {
       "category": "core",
       "codeowners": [],
@@ -498,26 +552,31 @@
     },
     "folder": {
       "category": "core",
-      "codeowners": [],
+      "codeowners": [
+        "grafana/grafana-as-code",
+        "grafana/grafana-frontend-platform",
+        "grafana/plugins-platform-frontend"
+      ],
       "crd": {
         "dummySchema": false,
-        "group": "",
-        "scope": ""
+        "group": "folder.core.grafana.com",
+        "scope": "Namespaced"
       },
       "currentVersion": [
         0,
         0
       ],
+      "description": "A folder is a collection of resources that are grouped together and can share permissions.",
       "grafanaMaturityCount": 0,
       "lineageIsGroup": false,
       "links": {
-        "docs": "n/a",
-        "go": "n/a",
-        "schema": "n/a",
-        "ts": "n/a"
+        "docs": "https://grafana.com/docs/grafana/next/developers/kinds/core/folder/schema-reference",
+        "go": "https://github.com/grafana/grafana/tree/main/pkg/kinds/folder",
+        "schema": "https://github.com/grafana/grafana/tree/main/kinds/folder/folder_kind.cue",
+        "ts": "https://github.com/grafana/grafana/tree/main/packages/grafana-schema/src/raw/folder/x/folder_types.gen.ts"
       },
       "machineName": "folder",
-      "maturity": "planned",
+      "maturity": "merged",
       "name": "Folder",
       "pluralMachineName": "folders",
       "pluralName": "Folders"
@@ -594,7 +653,9 @@
     },
     "googlecloudmonitoringdataquery": {
       "category": "composable",
-      "codeowners": [],
+      "codeowners": [
+        "grafana/partner-datasources"
+      ],
       "currentVersion": [
         0,
         0
@@ -602,13 +663,13 @@
       "grafanaMaturityCount": 0,
       "lineageIsGroup": false,
       "links": {
-        "docs": "n/a",
-        "go": "n/a",
-        "schema": "n/a",
-        "ts": "n/a"
+        "docs": "https://grafana.com/docs/grafana/next/developers/kinds/composable/googlecloudmonitoringdataquery/schema-reference",
+        "go": "https://github.com/grafana/grafana/tree/main/pkg/tsdb/cloud-monitoring/kinds/dataquery/types_dataquery_gen.go",
+        "schema": "https://github.com/grafana/grafana/tree/main/public/app/plugins/datasource/cloud-monitoring/dataquery.cue",
+        "ts": "https://github.com/grafana/grafana/tree/main/public/app/plugins/datasource/cloud-monitoring/dataquery.gen.ts"
       },
       "machineName": "googlecloudmonitoringdataquery",
-      "maturity": "planned",
+      "maturity": "merged",
       "name": "GoogleCloudMonitoringDataQuery",
       "pluralMachineName": "googlecloudmonitoringdataquerys",
       "pluralName": "GoogleCloudMonitoringDataQuerys",
@@ -680,6 +741,50 @@
       "pluralName": "GrafanaDataSourceCfgs",
       "schemaInterface": "DataSourceCfg"
     },
+    "grafanapyroscopedataquery": {
+      "category": "composable",
+      "codeowners": [],
+      "currentVersion": [
+        0,
+        0
+      ],
+      "grafanaMaturityCount": 0,
+      "lineageIsGroup": false,
+      "links": {
+        "docs": "https://grafana.com/docs/grafana/next/developers/kinds/composable/grafanapyroscopedataquery/schema-reference",
+        "go": "https://github.com/grafana/grafana/tree/main/pkg/tsdb/grafanapyroscope/kinds/dataquery/types_dataquery_gen.go",
+        "schema": "https://github.com/grafana/grafana/tree/main/public/app/plugins/datasource/grafanapyroscope/dataquery.cue",
+        "ts": "https://github.com/grafana/grafana/tree/main/public/app/plugins/datasource/grafanapyroscope/dataquery.gen.ts"
+      },
+      "machineName": "grafanapyroscopedataquery",
+      "maturity": "experimental",
+      "name": "GrafanaPyroscopeDataQuery",
+      "pluralMachineName": "grafanapyroscopedataquerys",
+      "pluralName": "GrafanaPyroscopeDataQuerys",
+      "schemaInterface": "DataQuery"
+    },
+    "grafanapyroscopedatasourcecfg": {
+      "category": "composable",
+      "codeowners": [],
+      "currentVersion": [
+        0,
+        0
+      ],
+      "grafanaMaturityCount": 0,
+      "lineageIsGroup": true,
+      "links": {
+        "docs": "n/a",
+        "go": "n/a",
+        "schema": "n/a",
+        "ts": "n/a"
+      },
+      "machineName": "grafanapyroscopedatasourcecfg",
+      "maturity": "planned",
+      "name": "GrafanaPyroscopeDataSourceCfg",
+      "pluralMachineName": "grafanapyroscopedatasourcecfgs",
+      "pluralName": "GrafanaPyroscopeDataSourceCfgs",
+      "schemaInterface": "DataSourceCfg"
+    },
     "graphitedataquery": {
       "category": "composable",
       "codeowners": [],
@@ -794,28 +899,6 @@
       "pluralName": "HistogramPanelCfgs",
       "schemaInterface": "PanelCfg"
     },
-    "iconpanelcfg": {
-      "category": "composable",
-      "codeowners": [],
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": true,
-      "links": {
-        "docs": "n/a",
-        "go": "n/a",
-        "schema": "n/a",
-        "ts": "n/a"
-      },
-      "machineName": "iconpanelcfg",
-      "maturity": "planned",
-      "name": "IconPanelCfg",
-      "pluralMachineName": "iconpanelcfgs",
-      "pluralName": "IconPanelCfgs",
-      "schemaInterface": "PanelCfg"
-    },
     "jaegerdataquery": {
       "category": "composable",
       "codeowners": [],
@@ -863,10 +946,9 @@
     "librarypanel": {
       "category": "core",
       "codeowners": [
-        "grafana/dataviz-squad",
         "grafana/grafana-as-code",
-        "grafana/plugins-platform-frontend",
-        "grafana/user-essentials"
+        "grafana/grafana-frontend-platform",
+        "grafana/plugins-platform-frontend"
       ],
       "crd": {
         "dummySchema": false,
@@ -878,7 +960,7 @@
         0
       ],
       "description": "A standalone panel",
-      "grafanaMaturityCount": 8,
+      "grafanaMaturityCount": 19,
       "lineageIsGroup": false,
       "links": {
         "docs": "https://grafana.com/docs/grafana/next/developers/kinds/core/librarypanel/schema-reference",
@@ -1075,7 +1157,7 @@
     "newspanelcfg": {
       "category": "composable",
       "codeowners": [
-        "grafana/user-essentials"
+        "grafana/grafana-frontend-platform"
       ],
       "currentVersion": [
         0,
@@ -1166,52 +1248,6 @@
       "pluralName": "ParcaDataSourceCfgs",
       "schemaInterface": "DataSourceCfg"
     },
-    "phlaredataquery": {
-      "category": "composable",
-      "codeowners": [
-        "grafana/observability-traces-and-profiling"
-      ],
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": false,
-      "links": {
-        "docs": "https://grafana.com/docs/grafana/next/developers/kinds/composable/phlaredataquery/schema-reference",
-        "go": "https://github.com/grafana/grafana/tree/main/pkg/tsdb/phlare/kinds/dataquery/types_dataquery_gen.go",
-        "schema": "https://github.com/grafana/grafana/tree/main/public/app/plugins/datasource/phlare/dataquery.cue",
-        "ts": "https://github.com/grafana/grafana/tree/main/public/app/plugins/datasource/phlare/dataquery.gen.ts"
-      },
-      "machineName": "phlaredataquery",
-      "maturity": "experimental",
-      "name": "PhlareDataQuery",
-      "pluralMachineName": "phlaredataquerys",
-      "pluralName": "PhlareDataQuerys",
-      "schemaInterface": "DataQuery"
-    },
-    "phlaredatasourcecfg": {
-      "category": "composable",
-      "codeowners": [],
-      "currentVersion": [
-        0,
-        0
-      ],
-      "grafanaMaturityCount": 0,
-      "lineageIsGroup": true,
-      "links": {
-        "docs": "n/a",
-        "go": "n/a",
-        "schema": "n/a",
-        "ts": "n/a"
-      },
-      "machineName": "phlaredatasourcecfg",
-      "maturity": "planned",
-      "name": "PhlareDataSourceCfg",
-      "pluralMachineName": "phlaredatasourcecfgs",
-      "pluralName": "PhlareDataSourceCfgs",
-      "schemaInterface": "DataSourceCfg"
-    },
     "piechartpanelcfg": {
       "category": "composable",
       "codeowners": [
@@ -1239,10 +1275,9 @@
     "playlist": {
       "category": "core",
       "codeowners": [
-        "grafana/dataviz-squad",
         "grafana/grafana-as-code",
-        "grafana/plugins-platform-frontend",
-        "grafana/user-essentials"
+        "grafana/grafana-frontend-platform",
+        "grafana/plugins-platform-frontend"
       ],
       "crd": {
         "dummySchema": false,
@@ -1315,10 +1350,9 @@
     "preferences": {
       "category": "core",
       "codeowners": [
-        "grafana/dataviz-squad",
         "grafana/grafana-as-code",
-        "grafana/plugins-platform-frontend",
-        "grafana/user-essentials"
+        "grafana/grafana-frontend-platform",
+        "grafana/plugins-platform-frontend"
       ],
       "crd": {
         "dummySchema": false,
@@ -1341,8 +1375,8 @@
       "machineName": "preferences",
       "maturity": "merged",
       "name": "Preferences",
-      "pluralMachineName": "preferencess",
-      "pluralName": "Preferencess"
+      "pluralMachineName": "preferences",
+      "pluralName": "Preferences"
     },
     "prometheusdataquery": {
       "category": "composable",
@@ -1393,10 +1427,9 @@
     "publicdashboard": {
       "category": "core",
       "codeowners": [
-        "grafana/dataviz-squad",
         "grafana/grafana-as-code",
-        "grafana/plugins-platform-frontend",
-        "grafana/user-essentials"
+        "grafana/grafana-frontend-platform",
+        "grafana/plugins-platform-frontend"
       ],
       "crd": {
         "dummySchema": false,
@@ -1474,34 +1507,90 @@
       "pluralMachineName": "queryhistorys",
       "pluralName": "QueryHistorys"
     },
-    "serviceaccount": {
+    "role": {
       "category": "core",
       "codeowners": [
-        "grafana/dataviz-squad",
         "grafana/grafana-as-code",
-        "grafana/plugins-platform-frontend",
-        "grafana/user-essentials"
+        "grafana/grafana-frontend-platform",
+        "grafana/plugins-platform-frontend"
       ],
       "crd": {
         "dummySchema": false,
-        "group": "serviceaccount.core.grafana.com",
+        "group": "role.core.grafana.com",
         "scope": "Namespaced"
       },
       "currentVersion": [
         0,
         0
       ],
-      "description": "system account",
-      "grafanaMaturityCount": 7,
+      "description": "Roles represent a set of users+teams that should share similar access",
+      "grafanaMaturityCount": 0,
       "lineageIsGroup": false,
       "links": {
-        "docs": "https://grafana.com/docs/grafana/next/developers/kinds/core/serviceaccount/schema-reference",
-        "go": "https://github.com/grafana/grafana/tree/main/pkg/kinds/serviceaccount",
-        "schema": "https://github.com/grafana/grafana/tree/main/kinds/serviceaccount/serviceaccount_kind.cue",
-        "ts": "https://github.com/grafana/grafana/tree/main/packages/grafana-schema/src/raw/serviceaccount/x/serviceaccount_types.gen.ts"
+        "docs": "https://grafana.com/docs/grafana/next/developers/kinds/core/role/schema-reference",
+        "go": "https://github.com/grafana/grafana/tree/main/pkg/kinds/role",
+        "schema": "https://github.com/grafana/grafana/tree/main/kinds/role/role_kind.cue",
+        "ts": "https://github.com/grafana/grafana/tree/main/packages/grafana-schema/src/raw/role/x/role_types.gen.ts"
+      },
+      "machineName": "role",
+      "maturity": "merged",
+      "name": "Role",
+      "pluralMachineName": "roles",
+      "pluralName": "Roles"
+    },
+    "rolebinding": {
+      "category": "core",
+      "codeowners": [
+        "grafana/grafana-as-code",
+        "grafana/grafana-frontend-platform",
+        "grafana/plugins-platform-frontend"
+      ],
+      "crd": {
+        "dummySchema": false,
+        "group": "rolebinding.core.grafana.com",
+        "scope": "Namespaced"
+      },
+      "currentVersion": [
+        0,
+        0
+      ],
+      "description": "Role bindings links a user|team to a configured role",
+      "grafanaMaturityCount": 0,
+      "lineageIsGroup": false,
+      "links": {
+        "docs": "https://grafana.com/docs/grafana/next/developers/kinds/core/rolebinding/schema-reference",
+        "go": "https://github.com/grafana/grafana/tree/main/pkg/kinds/rolebinding",
+        "schema": "https://github.com/grafana/grafana/tree/main/kinds/rolebinding/rolebinding_kind.cue",
+        "ts": "https://github.com/grafana/grafana/tree/main/packages/grafana-schema/src/raw/rolebinding/x/rolebinding_types.gen.ts"
+      },
+      "machineName": "rolebinding",
+      "maturity": "merged",
+      "name": "RoleBinding",
+      "pluralMachineName": "rolebindings",
+      "pluralName": "RoleBindings"
+    },
+    "serviceaccount": {
+      "category": "core",
+      "codeowners": [],
+      "crd": {
+        "dummySchema": false,
+        "group": "",
+        "scope": ""
+      },
+      "currentVersion": [
+        0,
+        0
+      ],
+      "grafanaMaturityCount": 0,
+      "lineageIsGroup": false,
+      "links": {
+        "docs": "n/a",
+        "go": "n/a",
+        "schema": "n/a",
+        "ts": "n/a"
       },
       "machineName": "serviceaccount",
-      "maturity": "merged",
+      "maturity": "planned",
       "name": "ServiceAccount",
       "pluralMachineName": "serviceaccounts",
       "pluralName": "ServiceAccounts"
@@ -1627,10 +1716,9 @@
     "team": {
       "category": "core",
       "codeowners": [
-        "grafana/dataviz-squad",
         "grafana/grafana-as-code",
-        "grafana/plugins-platform-frontend",
-        "grafana/user-essentials"
+        "grafana/grafana-frontend-platform",
+        "grafana/plugins-platform-frontend"
       ],
       "crd": {
         "dummySchema": false,
@@ -1642,7 +1730,7 @@
         0
       ],
       "description": "A team is a named grouping of Grafana users to which access control rules may be assigned.",
-      "grafanaMaturityCount": 5,
+      "grafanaMaturityCount": 0,
       "lineageIsGroup": false,
       "links": {
         "docs": "https://grafana.com/docs/grafana/next/developers/kinds/core/team/schema-reference",
@@ -1751,7 +1839,7 @@
     "textpanelcfg": {
       "category": "composable",
       "codeowners": [
-        "grafana/user-essentials"
+        "grafana/grafana-frontend-platform"
       ],
       "currentVersion": [
         0,
@@ -1798,6 +1886,30 @@
       "pluralMachineName": "thumbs",
       "pluralName": "Thumbs"
     },
+    "timeseriespanelcfg": {
+      "category": "composable",
+      "codeowners": [
+        "grafana/dataviz-squad"
+      ],
+      "currentVersion": [
+        0,
+        0
+      ],
+      "grafanaMaturityCount": 0,
+      "lineageIsGroup": true,
+      "links": {
+        "docs": "https://grafana.com/docs/grafana/next/developers/kinds/composable/timeseriespanelcfg/schema-reference",
+        "go": "n/a",
+        "schema": "https://github.com/grafana/grafana/tree/main/public/app/plugins/panel/timeseries/panelcfg.cue",
+        "ts": "https://github.com/grafana/grafana/tree/main/public/app/plugins/panel/timeseries/panelcfg.gen.ts"
+      },
+      "machineName": "timeseriespanelcfg",
+      "maturity": "merged",
+      "name": "TimeSeriesPanelCfg",
+      "pluralMachineName": "timeseriespanelcfgs",
+      "pluralName": "TimeSeriesPanelCfgs",
+      "schemaInterface": "PanelCfg"
+    },
     "tracespanelcfg": {
       "category": "composable",
       "codeowners": [],
@@ -1820,6 +1932,30 @@
       "pluralName": "TracesPanelCfgs",
       "schemaInterface": "PanelCfg"
     },
+    "trendpanelcfg": {
+      "category": "composable",
+      "codeowners": [
+        "grafana/dataviz-squad"
+      ],
+      "currentVersion": [
+        0,
+        0
+      ],
+      "grafanaMaturityCount": 0,
+      "lineageIsGroup": true,
+      "links": {
+        "docs": "https://grafana.com/docs/grafana/next/developers/kinds/composable/trendpanelcfg/schema-reference",
+        "go": "n/a",
+        "schema": "https://github.com/grafana/grafana/tree/main/public/app/plugins/panel/trend/panelcfg.cue",
+        "ts": "https://github.com/grafana/grafana/tree/main/public/app/plugins/panel/trend/panelcfg.gen.ts"
+      },
+      "machineName": "trendpanelcfg",
+      "maturity": "merged",
+      "name": "TrendPanelCfg",
+      "pluralMachineName": "trendpanelcfgs",
+      "pluralName": "TrendPanelCfgs",
+      "schemaInterface": "PanelCfg"
+    },
     "user": {
       "category": "core",
       "codeowners": [],
@@ -1956,6 +2092,7 @@
           "dashboarddataquery",
           "dashboarddatasourcecfg",
           "dashboardlistpanelcfg",
+          "datagridpanelcfg",
           "debugpanelcfg",
           "elasticsearchdataquery",
           "elasticsearchdatasourcecfg",
@@ -1967,12 +2104,13 @@
           "googlecloudmonitoringdatasourcecfg",
           "grafanadataquery",
           "grafanadatasourcecfg",
+          "grafanapyroscopedataquery",
+          "grafanapyroscopedatasourcecfg",
           "graphitedataquery",
           "graphitedatasourcecfg",
           "grapholdpanelcfg",
           "heatmappanelcfg",
           "histogrampanelcfg",
-          "iconpanelcfg",
           "jaegerdataquery",
           "jaegerdatasourcecfg",
           "livepanelcfg",
@@ -1987,8 +2125,6 @@
           "nodegraphpanelcfg",
           "parcadataquery",
           "parcadatasourcecfg",
-          "phlaredataquery",
-          "phlaredatasourcecfg",
           "piechartpanelcfg",
           "postgresqldataquery",
           "postgresqldatasourcecfg",
@@ -2004,17 +2140,20 @@
           "testdatadataquery",
           "testdatadatasourcecfg",
           "textpanelcfg",
+          "timeseriespanelcfg",
           "tracespanelcfg",
+          "trendpanelcfg",
           "welcomepanelcfg",
           "xychartpanelcfg",
           "zipkindataquery",
           "zipkindatasourcecfg"
         ],
-        "count": 67
+        "count": 69
       },
       "core": {
         "name": "core",
         "items": [
+          "accesspolicy",
           "apikey",
           "dashboard",
           "datasource",
@@ -2025,12 +2164,14 @@
           "publicdashboard",
           "query",
           "queryhistory",
+          "role",
+          "rolebinding",
           "serviceaccount",
           "team",
           "thumb",
           "user"
         ],
-        "count": 14
+        "count": 17
       }
     },
     "maturity": {
@@ -2040,12 +2181,15 @@
           "annotationslistpanelcfg",
           "barchartpanelcfg",
           "bargaugepanelcfg",
+          "cloudwatchdataquery",
           "dashboard",
           "dashboardlistpanelcfg",
+          "datagridpanelcfg",
           "debugpanelcfg",
           "elasticsearchdataquery",
           "gaugepanelcfg",
           "geomappanelcfg",
+          "grafanapyroscopedataquery",
           "histogrampanelcfg",
           "librarypanel",
           "logspanelcfg",
@@ -2053,7 +2197,6 @@
           "newspanelcfg",
           "nodegraphpanelcfg",
           "parcadataquery",
-          "phlaredataquery",
           "piechartpanelcfg",
           "prometheusdataquery",
           "statetimelinepanelcfg",
@@ -2065,7 +2208,7 @@
           "textpanelcfg",
           "xychartpanelcfg"
         ],
-        "count": 27
+        "count": 29
       },
       "mature": {
         "name": "mature",
@@ -2075,17 +2218,22 @@
       "merged": {
         "name": "merged",
         "items": [
+          "accesspolicy",
           "alertgroupspanelcfg",
           "azuremonitordataquery",
-          "cloudwatchdataquery",
+          "folder",
+          "googlecloudmonitoringdataquery",
           "heatmappanelcfg",
           "playlist",
           "preferences",
           "publicdashboard",
-          "serviceaccount",
-          "team"
+          "role",
+          "rolebinding",
+          "team",
+          "timeseriespanelcfg",
+          "trendpanelcfg"
         ],
-        "count": 9
+        "count": 14
       },
       "planned": {
         "name": "planned",
@@ -2101,16 +2249,14 @@
           "datasource",
           "elasticsearchdatasourcecfg",
           "flamegraphpanelcfg",
-          "folder",
           "gettingstartedpanelcfg",
-          "googlecloudmonitoringdataquery",
           "googlecloudmonitoringdatasourcecfg",
           "grafanadataquery",
           "grafanadatasourcecfg",
+          "grafanapyroscopedatasourcecfg",
           "graphitedataquery",
           "graphitedatasourcecfg",
           "grapholdpanelcfg",
-          "iconpanelcfg",
           "jaegerdataquery",
           "jaegerdatasourcecfg",
           "livepanelcfg",
@@ -2120,12 +2266,12 @@
           "mysqldataquery",
           "mysqldatasourcecfg",
           "parcadatasourcecfg",
-          "phlaredatasourcecfg",
           "postgresqldataquery",
           "postgresqldatasourcecfg",
           "prometheusdatasourcecfg",
           "query",
           "queryhistory",
+          "serviceaccount",
           "tableoldpanelcfg",
           "tempodatasourcecfg",
           "testdatadatasourcecfg",
@@ -2136,7 +2282,7 @@
           "zipkindataquery",
           "zipkindatasourcecfg"
         ],
-        "count": 45
+        "count": 43
       },
       "stable": {
         "name": "stable",
diff --git a/pkg/services/featuremgmt/codeowners.go b/pkg/services/featuremgmt/codeowners.go
index 6c3543aa9ef..f97d7b3430d 100644
--- a/pkg/services/featuremgmt/codeowners.go
+++ b/pkg/services/featuremgmt/codeowners.go
@@ -10,7 +10,7 @@ const (
 	grafanaExploreSquad                         codeowner = "@grafana/explore-squad"
 	grafanaBiSquad                              codeowner = "@grafana/grafana-bi-squad"
 	grafanaDatavizSquad                         codeowner = "@grafana/dataviz-squad"
-	grafanaUserEssentialsSquad                  codeowner = "@grafana/user-essentials"
+	grafanaFrontendPlatformSquad                codeowner = "@grafana/grafana-frontend-platform"
 	grafanaBackendPlatformSquad                 codeowner = "@grafana/backend-platform"
 	grafanaPluginsPlatformSquad                 codeowner = "@grafana/plugins-platform-backend"
 	grafanaAsCodeSquad                          codeowner = "@grafana/grafana-as-code"
diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go
index 4738005065f..5b11d9f7af0 100644
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@@ -191,7 +191,7 @@ var (
 			Description: "Enables new top navigation and page layouts",
 			State:       FeatureStateStable,
 			Expression:  "true", // enabled by default
-			Owner:       grafanaUserEssentialsSquad,
+			Owner:       grafanaFrontendPlatformSquad,
 		},
 		{
 			Name:        "grpcServer",
@@ -533,7 +533,7 @@ var (
 			Description:  "Enables extra themes",
 			FrontendOnly: true,
 			State:        FeatureStateAlpha,
-			Owner:        grafanaUserEssentialsSquad,
+			Owner:        grafanaFrontendPlatformSquad,
 		},
 		{
 			Name:         "lokiPredefinedOperations",
diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv
index b7ea1e85c78..96932762e53 100644
--- a/pkg/services/featuremgmt/toggles_gen.csv
+++ b/pkg/services/featuremgmt/toggles_gen.csv
@@ -26,7 +26,7 @@ scenes,alpha,@grafana/dashboards-squad,false,false,false,true
 disableSecretsCompatibility,alpha,@grafana/hosted-grafana-team,false,false,true,false
 logRequestsInstrumentedAsUnknown,alpha,@grafana/hosted-grafana-team,false,false,false,false
 dataConnectionsConsole,stable,@grafana/plugins-platform-backend,false,false,false,false
-topnav,stable,@grafana/user-essentials,false,false,false,false
+topnav,stable,@grafana/grafana-frontend-platform,false,false,false,false
 grpcServer,beta,@grafana/grafana-app-platform-squad,false,false,false,false
 entityStore,alpha,@grafana/grafana-app-platform-squad,true,false,false,false
 cloudWatchCrossAccountQuerying,stable,@grafana/aws-plugins,false,false,false,false
@@ -77,6 +77,6 @@ advancedDataSourcePicker,stable,@grafana/dashboards-squad,false,false,false,true
 faroDatasourceSelector,beta,@grafana/app-o11y,false,false,false,true
 enableDatagridEditing,beta,@grafana/grafana-bi-squad,false,false,false,true
 dataSourcePageHeader,beta,@grafana/enterprise-datasources,false,false,false,true
-extraThemes,alpha,@grafana/user-essentials,false,false,false,true
+extraThemes,alpha,@grafana/grafana-frontend-platform,false,false,false,true
 lokiPredefinedOperations,alpha,@grafana/observability-logs,false,false,false,true
 pluginsFrontendSandbox,alpha,@grafana/plugins-platform-backend,false,false,false,true