diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 8dce1268c27..0a9dea7dd97 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -388,10 +388,10 @@ lerna.json @grafana/frontend-ops
 /public/app/plugins/panel/alertlist/ @grafana/alerting-squad-frontend
 /public/app/plugins/panel/annolist/ @grafana/user-essentials
 /public/app/plugins/panel/barchart/ @grafana/dataviz-squad
-/public/app/plugins/panel/bargauge/ @grafana/dataviz-squad
+/public/app/plugins/panel/bargauge/ @grafana/grafana-bi-squad
 /public/app/plugins/panel/dashlist/ @grafana/user-essentials
 /public/app/plugins/panel/debug/ @ryantxu
-/public/app/plugins/panel/gauge/ @grafana/dataviz-squad
+/public/app/plugins/panel/gauge/ @grafana/grafana-bi-squad
 /public/app/plugins/panel/gettingstarted/ @grafana/user-essentials
 /public/app/plugins/panel/graph/ @grafana/dataviz-squad
 /public/app/plugins/panel/heatmap/ @grafana/dataviz-squad
@@ -400,7 +400,7 @@ lerna.json @grafana/frontend-ops
 /public/app/plugins/panel/nodeGraph/ @grafana/observability-traces-and-profiling
 /public/app/plugins/panel/traces/ @grafana/observability-traces-and-profiling
 /public/app/plugins/panel/flamegraph/ @grafana/observability-traces-and-profiling
-/public/app/plugins/panel/piechart/ @grafana/dataviz-squad
+/public/app/plugins/panel/piechart/ @grafana/grafana-bi-squad
 /public/app/plugins/panel/state-timeline/ @grafana/dataviz-squad
 /public/app/plugins/panel/status-history/ @grafana/dataviz-squad
 /public/app/plugins/panel/table/ @grafana/grafana-bi-squad
@@ -412,7 +412,7 @@ lerna.json @grafana/frontend-ops
 /public/app/plugins/panel/icon/ @grafana/dataviz-squad
 /public/app/plugins/panel/live/ @grafana/grafana-app-platform-squad
 /public/app/plugins/panel/news/ @grafana/user-essentials
-/public/app/plugins/panel/stat/ @grafana/dataviz-squad
+/public/app/plugins/panel/stat/ @grafana/grafana-bi-squad
 /public/app/plugins/panel/text/ @grafana/user-essentials
 /public/app/plugins/panel/welcome/ @grafana/user-essentials
 /public/app/plugins/panel/xychart/ @grafana/dataviz-squad
diff --git a/pkg/kindsys/report.json b/pkg/kindsys/report.json
index 44de5a0bf32..98f0af2335c 100644
--- a/pkg/kindsys/report.json
+++ b/pkg/kindsys/report.json
@@ -211,7 +211,7 @@
     "bargaugepanelcfg": {
       "category": "composable",
       "codeowners": [
-        "grafana/dataviz-squad"
+        "grafana/grafana-bi-squad"
       ],
       "currentVersion": [
         0,
@@ -525,7 +525,7 @@
     "gaugepanelcfg": {
       "category": "composable",
       "codeowners": [
-        "grafana/dataviz-squad"
+        "grafana/grafana-bi-squad"
       ],
       "currentVersion": [
         0,
@@ -1215,7 +1215,7 @@
     "piechartpanelcfg": {
       "category": "composable",
       "codeowners": [
-        "grafana/dataviz-squad"
+        "grafana/grafana-bi-squad"
       ],
       "currentVersion": [
         0,
@@ -1531,7 +1531,7 @@
     "statpanelcfg": {
       "category": "composable",
       "codeowners": [
-        "grafana/dataviz-squad"
+        "grafana/grafana-bi-squad"
       ],
       "currentVersion": [
         0,