diff --git a/CHANGELOG.md b/CHANGELOG.md
index 03beb66baf1..1b64e27b404 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+<!-- 12.0.3 START -->
+
+# 12.0.3 (2025-07-23)
+
+### Bug fixes
+
+- **Security:** Fixes for CVE-2025-6197 and CVE-2025-6023 [#108280](https://github.com/grafana/grafana/pull/108280), [@volcanonoodle](https://github.com/volcanonoodle)
+
+<!-- 12.0.3 END -->
 <!-- 12.0.2 START -->
 
 # 12.0.2 (2025-06-17)
diff --git a/lerna.json b/lerna.json
index f5ab4577f09..3e9670ec0d1 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
   "npmClient": "yarn",
-  "version": "12.0.3"
+  "version": "12.0.4"
 }
diff --git a/package.json b/package.json
index 241c8c59678..3370bbff7eb 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "license": "AGPL-3.0-only",
   "private": true,
   "name": "grafana",
-  "version": "12.0.3",
+  "version": "12.0.4",
   "repository": "github:grafana/grafana",
   "scripts": {
     "build": "NODE_ENV=production nx exec --verbose -- webpack --config scripts/webpack/webpack.prod.js --progress",
diff --git a/packages/grafana-data/package.json b/packages/grafana-data/package.json
index c04edff98d3..38797c04159 100644
--- a/packages/grafana-data/package.json
+++ b/packages/grafana-data/package.json
@@ -2,7 +2,7 @@
   "author": "Grafana Labs",
   "license": "Apache-2.0",
   "name": "@grafana/data",
-  "version": "12.0.3",
+  "version": "12.0.4",
   "description": "Grafana Data Library",
   "keywords": [
     "typescript"
@@ -56,7 +56,7 @@
   },
   "dependencies": {
     "@braintree/sanitize-url": "7.0.1",
-    "@grafana/schema": "12.0.3",
+    "@grafana/schema": "12.0.4",
     "@types/d3-interpolate": "^3.0.0",
     "@types/string-hash": "1.1.3",
     "@types/systemjs": "6.15.1",
diff --git a/packages/grafana-e2e-selectors/package.json b/packages/grafana-e2e-selectors/package.json
index c075ee05f14..d286455d8cb 100644
--- a/packages/grafana-e2e-selectors/package.json
+++ b/packages/grafana-e2e-selectors/package.json
@@ -2,7 +2,7 @@
   "author": "Grafana Labs",
   "license": "Apache-2.0",
   "name": "@grafana/e2e-selectors",
-  "version": "12.0.3",
+  "version": "12.0.4",
   "description": "Grafana End-to-End Test Selectors Library",
   "keywords": [
     "cli",
diff --git a/packages/grafana-eslint-rules/package.json b/packages/grafana-eslint-rules/package.json
index f34623ea68e..6158b2637e8 100644
--- a/packages/grafana-eslint-rules/package.json
+++ b/packages/grafana-eslint-rules/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@grafana/eslint-plugin",
   "description": "ESLint rules for use within the Grafana repo. Not suitable (or supported) for external use.",
-  "version": "12.0.3",
+  "version": "12.0.4",
   "main": "./index.cjs",
   "author": "Grafana Labs",
   "license": "Apache-2.0",
diff --git a/packages/grafana-flamegraph/package.json b/packages/grafana-flamegraph/package.json
index 958d259b8f6..dc54c873be1 100644
--- a/packages/grafana-flamegraph/package.json
+++ b/packages/grafana-flamegraph/package.json
@@ -2,7 +2,7 @@
   "author": "Grafana Labs",
   "license": "Apache-2.0",
   "name": "@grafana/flamegraph",
-  "version": "12.0.3",
+  "version": "12.0.4",
   "description": "Grafana flamegraph visualization component",
   "keywords": [
     "grafana",
@@ -44,8 +44,8 @@
   ],
   "dependencies": {
     "@emotion/css": "11.13.5",
-    "@grafana/data": "12.0.3",
-    "@grafana/ui": "12.0.3",
+    "@grafana/data": "12.0.4",
+    "@grafana/ui": "12.0.4",
     "@leeoniya/ufuzzy": "1.0.18",
     "d3": "^7.8.5",
     "lodash": "4.17.21",
diff --git a/packages/grafana-icons/package.json b/packages/grafana-icons/package.json
index c88ba62814a..107038dc67c 100644
--- a/packages/grafana-icons/package.json
+++ b/packages/grafana-icons/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@grafana/saga-icons",
-  "version": "12.0.3",
+  "version": "12.0.4",
   "private": true,
   "description": "Icons for Grafana",
   "author": "Grafana Labs",
diff --git a/packages/grafana-o11y-ds-frontend/package.json b/packages/grafana-o11y-ds-frontend/package.json
index f6252709407..bdb40d50d76 100644
--- a/packages/grafana-o11y-ds-frontend/package.json
+++ b/packages/grafana-o11y-ds-frontend/package.json
@@ -3,7 +3,7 @@
   "license": "AGPL-3.0-only",
   "name": "@grafana/o11y-ds-frontend",
   "private": true,
-  "version": "12.0.3",
+  "version": "12.0.4",
   "description": "Library to manage traces in Grafana.",
   "sideEffects": false,
   "repository": {
@@ -18,12 +18,12 @@
   },
   "dependencies": {
     "@emotion/css": "11.13.5",
-    "@grafana/data": "12.0.3",
-    "@grafana/e2e-selectors": "12.0.3",
+    "@grafana/data": "12.0.4",
+    "@grafana/e2e-selectors": "12.0.4",
     "@grafana/plugin-ui": "0.10.5",
-    "@grafana/runtime": "12.0.3",
-    "@grafana/schema": "12.0.3",
-    "@grafana/ui": "12.0.3",
+    "@grafana/runtime": "12.0.4",
+    "@grafana/schema": "12.0.4",
+    "@grafana/ui": "12.0.4",
     "react-select": "5.10.0",
     "react-use": "17.6.0",
     "rxjs": "7.8.1",
diff --git a/packages/grafana-plugin-configs/package.json b/packages/grafana-plugin-configs/package.json
index d3de126746e..83b33faa375 100644
--- a/packages/grafana-plugin-configs/package.json
+++ b/packages/grafana-plugin-configs/package.json
@@ -2,7 +2,7 @@
   "name": "@grafana/plugin-configs",
   "description": "Shared dependencies and files for core plugins",
   "private": true,
-  "version": "12.0.3",
+  "version": "12.0.4",
   "dependencies": {
     "tslib": "2.8.1"
   },
diff --git a/packages/grafana-prometheus/package.json b/packages/grafana-prometheus/package.json
index e50f26774e3..817772de236 100644
--- a/packages/grafana-prometheus/package.json
+++ b/packages/grafana-prometheus/package.json
@@ -2,7 +2,7 @@
   "author": "Grafana Labs",
   "license": "AGPL-3.0-only",
   "name": "@grafana/prometheus",
-  "version": "12.0.3",
+  "version": "12.0.4",
   "description": "Grafana Prometheus Library",
   "keywords": [
     "typescript"
@@ -38,12 +38,12 @@
   "dependencies": {
     "@emotion/css": "11.13.5",
     "@floating-ui/react": "0.27.7",
-    "@grafana/data": "12.0.3",
-    "@grafana/e2e-selectors": "12.0.3",
+    "@grafana/data": "12.0.4",
+    "@grafana/e2e-selectors": "12.0.4",
     "@grafana/plugin-ui": "0.10.5",
-    "@grafana/runtime": "12.0.3",
-    "@grafana/schema": "12.0.3",
-    "@grafana/ui": "12.0.3",
+    "@grafana/runtime": "12.0.4",
+    "@grafana/schema": "12.0.4",
+    "@grafana/ui": "12.0.4",
     "@hello-pangea/dnd": "17.0.0",
     "@leeoniya/ufuzzy": "1.0.18",
     "@lezer/common": "1.2.3",
diff --git a/packages/grafana-runtime/package.json b/packages/grafana-runtime/package.json
index 9263dd75e0f..de43d321017 100644
--- a/packages/grafana-runtime/package.json
+++ b/packages/grafana-runtime/package.json
@@ -2,7 +2,7 @@
   "author": "Grafana Labs",
   "license": "Apache-2.0",
   "name": "@grafana/runtime",
-  "version": "12.0.3",
+  "version": "12.0.4",
   "description": "Grafana Runtime Library",
   "keywords": [
     "grafana",
@@ -53,11 +53,11 @@
     "postpack": "mv package.json.bak package.json && rimraf ./unstable"
   },
   "dependencies": {
-    "@grafana/data": "12.0.3",
-    "@grafana/e2e-selectors": "12.0.3",
+    "@grafana/data": "12.0.4",
+    "@grafana/e2e-selectors": "12.0.4",
     "@grafana/faro-web-sdk": "^1.13.2",
-    "@grafana/schema": "12.0.3",
-    "@grafana/ui": "12.0.3",
+    "@grafana/schema": "12.0.4",
+    "@grafana/ui": "12.0.4",
     "@types/systemjs": "6.15.1",
     "history": "4.10.1",
     "lodash": "4.17.21",
diff --git a/packages/grafana-schema/package.json b/packages/grafana-schema/package.json
index 9006db979d5..79978fd6314 100644
--- a/packages/grafana-schema/package.json
+++ b/packages/grafana-schema/package.json
@@ -2,7 +2,7 @@
   "author": "Grafana Labs",
   "license": "Apache-2.0",
   "name": "@grafana/schema",
-  "version": "12.0.3",
+  "version": "12.0.4",
   "description": "Grafana Schema Library",
   "keywords": [
     "typescript"
diff --git a/packages/grafana-schema/src/raw/composable/annotationslist/panelcfg/x/AnnotationsListPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/annotationslist/panelcfg/x/AnnotationsListPanelCfg_types.gen.ts
index d6d31388b2f..723b8e4fcef 100644
--- a/packages/grafana-schema/src/raw/composable/annotationslist/panelcfg/x/AnnotationsListPanelCfg_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/annotationslist/panelcfg/x/AnnotationsListPanelCfg_types.gen.ts
@@ -8,7 +8,7 @@
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
-export const pluginVersion = "12.0.3";
+export const pluginVersion = "12.0.4";
 
 export interface Options {
   limit: number;
diff --git a/packages/grafana-schema/src/raw/composable/barchart/panelcfg/x/BarChartPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/barchart/panelcfg/x/BarChartPanelCfg_types.gen.ts
index 90738d44a8a..5920cb89291 100644
--- a/packages/grafana-schema/src/raw/composable/barchart/panelcfg/x/BarChartPanelCfg_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/barchart/panelcfg/x/BarChartPanelCfg_types.gen.ts
@@ -10,7 +10,7 @@
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "12.0.3";
+export const pluginVersion = "12.0.4";
 
 export interface Options extends common.OptionsWithLegend, common.OptionsWithTooltip, common.OptionsWithTextFormatting {
   /**
diff --git a/packages/grafana-schema/src/raw/composable/bargauge/panelcfg/x/BarGaugePanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/bargauge/panelcfg/x/BarGaugePanelCfg_types.gen.ts
index 6e605e18d6b..be5cf847fd3 100644
--- a/packages/grafana-schema/src/raw/composable/bargauge/panelcfg/x/BarGaugePanelCfg_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/bargauge/panelcfg/x/BarGaugePanelCfg_types.gen.ts
@@ -10,7 +10,7 @@
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "12.0.3";
+export const pluginVersion = "12.0.4";
 
 export interface Options extends common.OptionsWithLegend, common.SingleStatBaseOptions {
   displayMode: common.BarGaugeDisplayMode;
diff --git a/packages/grafana-schema/src/raw/composable/candlestick/panelcfg/x/CandlestickPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/candlestick/panelcfg/x/CandlestickPanelCfg_types.gen.ts
index c3386041e9c..2aac30ed867 100644
--- a/packages/grafana-schema/src/raw/composable/candlestick/panelcfg/x/CandlestickPanelCfg_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/candlestick/panelcfg/x/CandlestickPanelCfg_types.gen.ts
@@ -10,7 +10,7 @@
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "12.0.3";
+export const pluginVersion = "12.0.4";
 
 export enum VizDisplayMode {
   Candles = 'candles',
diff --git a/packages/grafana-schema/src/raw/composable/canvas/panelcfg/x/CanvasPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/canvas/panelcfg/x/CanvasPanelCfg_types.gen.ts
index 786cd1441fb..5d982660fb4 100644
--- a/packages/grafana-schema/src/raw/composable/canvas/panelcfg/x/CanvasPanelCfg_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/canvas/panelcfg/x/CanvasPanelCfg_types.gen.ts
@@ -10,7 +10,7 @@
 
 import * as ui from '@grafana/schema';
 
-export const pluginVersion = "12.0.3";
+export const pluginVersion = "12.0.4";
 
 export enum HorizontalConstraint {
   Center = 'center',
diff --git a/packages/grafana-schema/src/raw/composable/cloudwatch/dataquery/x/CloudWatchDataQuery_types.gen.ts b/packages/grafana-schema/src/raw/composable/cloudwatch/dataquery/x/CloudWatchDataQuery_types.gen.ts
index ea99a63b917..d2926a42343 100644
--- a/packages/grafana-schema/src/raw/composable/cloudwatch/dataquery/x/CloudWatchDataQuery_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/cloudwatch/dataquery/x/CloudWatchDataQuery_types.gen.ts
@@ -10,7 +10,7 @@
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "12.0.3";
+export const pluginVersion = "12.0.4";
 
 export interface MetricStat {
   /**
diff --git a/packages/grafana-schema/src/raw/composable/dashboardlist/panelcfg/x/DashboardListPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/dashboardlist/panelcfg/x/DashboardListPanelCfg_types.gen.ts
index d9ade026a93..034b163f93c 100644
--- a/packages/grafana-schema/src/raw/composable/dashboardlist/panelcfg/x/DashboardListPanelCfg_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/dashboardlist/panelcfg/x/DashboardListPanelCfg_types.gen.ts
@@ -8,7 +8,7 @@
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
-export const pluginVersion = "12.0.3";
+export const pluginVersion = "12.0.4";
 
 export interface Options {
   /**
diff --git a/packages/grafana-schema/src/raw/composable/datagrid/panelcfg/x/DatagridPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/datagrid/panelcfg/x/DatagridPanelCfg_types.gen.ts
index 376322d3e21..2ad51443be8 100644
--- a/packages/grafana-schema/src/raw/composable/datagrid/panelcfg/x/DatagridPanelCfg_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/datagrid/panelcfg/x/DatagridPanelCfg_types.gen.ts
@@ -8,7 +8,7 @@
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
-export const pluginVersion = "12.0.3";
+export const pluginVersion = "12.0.4";
 
 export interface Options {
   selectedSeries: number;
diff --git a/packages/grafana-schema/src/raw/composable/debug/panelcfg/x/DebugPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/debug/panelcfg/x/DebugPanelCfg_types.gen.ts
index aeebfa1e843..e7a3108c273 100644
--- a/packages/grafana-schema/src/raw/composable/debug/panelcfg/x/DebugPanelCfg_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/debug/panelcfg/x/DebugPanelCfg_types.gen.ts
@@ -8,7 +8,7 @@
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
-export const pluginVersion = "12.0.3";
+export const pluginVersion = "12.0.4";
 
 export type UpdateConfig = {
   render: boolean,
diff --git a/packages/grafana-schema/src/raw/composable/elasticsearch/dataquery/x/ElasticsearchDataQuery_types.gen.ts b/packages/grafana-schema/src/raw/composable/elasticsearch/dataquery/x/ElasticsearchDataQuery_types.gen.ts
index 0b395c44070..5b7d67955d1 100644
--- a/packages/grafana-schema/src/raw/composable/elasticsearch/dataquery/x/ElasticsearchDataQuery_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/elasticsearch/dataquery/x/ElasticsearchDataQuery_types.gen.ts
@@ -10,7 +10,7 @@
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "12.0.3";
+export const pluginVersion = "12.0.4";
 
 export type BucketAggregation = (DateHistogram | Histogram | Terms | Filters | GeoHashGrid | Nested);
 
diff --git a/packages/grafana-schema/src/raw/composable/gauge/panelcfg/x/GaugePanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/gauge/panelcfg/x/GaugePanelCfg_types.gen.ts
index 0cb17007e35..d88fbb5e67b 100644
--- a/packages/grafana-schema/src/raw/composable/gauge/panelcfg/x/GaugePanelCfg_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/gauge/panelcfg/x/GaugePanelCfg_types.gen.ts
@@ -10,7 +10,7 @@
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "12.0.3";
+export const pluginVersion = "12.0.4";
 
 export interface Options extends common.SingleStatBaseOptions {
   minVizHeight: number;
diff --git a/packages/grafana-schema/src/raw/composable/geomap/panelcfg/x/GeomapPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/geomap/panelcfg/x/GeomapPanelCfg_types.gen.ts
index 3476a4f7bfc..f8108ee2751 100644
--- a/packages/grafana-schema/src/raw/composable/geomap/panelcfg/x/GeomapPanelCfg_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/geomap/panelcfg/x/GeomapPanelCfg_types.gen.ts
@@ -10,7 +10,7 @@
 
 import * as ui from '@grafana/schema';
 
-export const pluginVersion = "12.0.3";
+export const pluginVersion = "12.0.4";
 
 export interface Options {
   basemap: ui.MapLayerOptions;
diff --git a/packages/grafana-schema/src/raw/composable/heatmap/panelcfg/x/HeatmapPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/heatmap/panelcfg/x/HeatmapPanelCfg_types.gen.ts
index 2c4080a768e..0278a55d062 100644
--- a/packages/grafana-schema/src/raw/composable/heatmap/panelcfg/x/HeatmapPanelCfg_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/heatmap/panelcfg/x/HeatmapPanelCfg_types.gen.ts
@@ -10,7 +10,7 @@
 
 import * as ui from '@grafana/schema';
 
-export const pluginVersion = "12.0.3";
+export const pluginVersion = "12.0.4";
 
 /**
  * Controls the color mode of the heatmap
diff --git a/packages/grafana-schema/src/raw/composable/histogram/panelcfg/x/HistogramPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/histogram/panelcfg/x/HistogramPanelCfg_types.gen.ts
index 26ab10acdad..21f00556654 100644
--- a/packages/grafana-schema/src/raw/composable/histogram/panelcfg/x/HistogramPanelCfg_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/histogram/panelcfg/x/HistogramPanelCfg_types.gen.ts
@@ -10,7 +10,7 @@
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "12.0.3";
+export const pluginVersion = "12.0.4";
 
 export interface Options extends common.OptionsWithLegend, common.OptionsWithTooltip {
   /**
diff --git a/packages/grafana-schema/src/raw/composable/logs/panelcfg/x/LogsPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/logs/panelcfg/x/LogsPanelCfg_types.gen.ts
index 4db34a53e74..b8e6ae30124 100644
--- a/packages/grafana-schema/src/raw/composable/logs/panelcfg/x/LogsPanelCfg_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/logs/panelcfg/x/LogsPanelCfg_types.gen.ts
@@ -10,7 +10,7 @@
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "12.0.3";
+export const pluginVersion = "12.0.4";
 
 export interface Options {
   dedupStrategy: common.LogsDedupStrategy;
diff --git a/packages/grafana-schema/src/raw/composable/logsnew/panelcfg/x/LogsNewPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/logsnew/panelcfg/x/LogsNewPanelCfg_types.gen.ts
index 6078e300150..fb52e712fbe 100644
--- a/packages/grafana-schema/src/raw/composable/logsnew/panelcfg/x/LogsNewPanelCfg_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/logsnew/panelcfg/x/LogsNewPanelCfg_types.gen.ts
@@ -10,7 +10,7 @@
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "12.0.3";
+export const pluginVersion = "12.0.4";
 
 export interface Options {
   dedupStrategy: common.LogsDedupStrategy;
diff --git a/packages/grafana-schema/src/raw/composable/loki/dataquery/x/LokiDataQuery_types.gen.ts b/packages/grafana-schema/src/raw/composable/loki/dataquery/x/LokiDataQuery_types.gen.ts
index 7e1421fcea3..67770795c60 100644
--- a/packages/grafana-schema/src/raw/composable/loki/dataquery/x/LokiDataQuery_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/loki/dataquery/x/LokiDataQuery_types.gen.ts
@@ -10,7 +10,7 @@
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "12.0.3";
+export const pluginVersion = "12.0.4";
 
 export enum QueryEditorMode {
   Builder = 'builder',
diff --git a/packages/grafana-schema/src/raw/composable/news/panelcfg/x/NewsPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/news/panelcfg/x/NewsPanelCfg_types.gen.ts
index 7dcdcab8e0d..acab591e15b 100644
--- a/packages/grafana-schema/src/raw/composable/news/panelcfg/x/NewsPanelCfg_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/news/panelcfg/x/NewsPanelCfg_types.gen.ts
@@ -8,7 +8,7 @@
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
-export const pluginVersion = "12.0.3";
+export const pluginVersion = "12.0.4";
 
 export interface Options {
   /**
diff --git a/packages/grafana-schema/src/raw/composable/nodegraph/panelcfg/x/NodeGraphPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/nodegraph/panelcfg/x/NodeGraphPanelCfg_types.gen.ts
index ea0106163a1..edead0b86bd 100644
--- a/packages/grafana-schema/src/raw/composable/nodegraph/panelcfg/x/NodeGraphPanelCfg_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/nodegraph/panelcfg/x/NodeGraphPanelCfg_types.gen.ts
@@ -8,7 +8,7 @@
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
-export const pluginVersion = "12.0.3";
+export const pluginVersion = "12.0.4";
 
 export interface ArcOption {
   /**
diff --git a/packages/grafana-schema/src/raw/composable/piechart/panelcfg/x/PieChartPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/piechart/panelcfg/x/PieChartPanelCfg_types.gen.ts
index 1b0f790fb63..bf04b1cc5ad 100644
--- a/packages/grafana-schema/src/raw/composable/piechart/panelcfg/x/PieChartPanelCfg_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/piechart/panelcfg/x/PieChartPanelCfg_types.gen.ts
@@ -10,7 +10,7 @@
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "12.0.3";
+export const pluginVersion = "12.0.4";
 
 /**
  * Select the pie chart display style.
diff --git a/packages/grafana-schema/src/raw/composable/stat/panelcfg/x/StatPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/stat/panelcfg/x/StatPanelCfg_types.gen.ts
index 5c0c76439ab..f789847789c 100644
--- a/packages/grafana-schema/src/raw/composable/stat/panelcfg/x/StatPanelCfg_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/stat/panelcfg/x/StatPanelCfg_types.gen.ts
@@ -10,7 +10,7 @@
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "12.0.3";
+export const pluginVersion = "12.0.4";
 
 export interface Options extends common.SingleStatBaseOptions {
   colorMode: common.BigValueColorMode;
diff --git a/packages/grafana-schema/src/raw/composable/statetimeline/panelcfg/x/StateTimelinePanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/statetimeline/panelcfg/x/StateTimelinePanelCfg_types.gen.ts
index 54da1770674..1e5562039f6 100644
--- a/packages/grafana-schema/src/raw/composable/statetimeline/panelcfg/x/StateTimelinePanelCfg_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/statetimeline/panelcfg/x/StateTimelinePanelCfg_types.gen.ts
@@ -10,7 +10,7 @@
 
 import * as ui from '@grafana/schema';
 
-export const pluginVersion = "12.0.3";
+export const pluginVersion = "12.0.4";
 
 export interface Options extends ui.OptionsWithLegend, ui.OptionsWithTooltip, ui.OptionsWithTimezones {
   /**
diff --git a/packages/grafana-schema/src/raw/composable/statushistory/panelcfg/x/StatusHistoryPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/statushistory/panelcfg/x/StatusHistoryPanelCfg_types.gen.ts
index dab98fef3c3..2e43d1a5f9b 100644
--- a/packages/grafana-schema/src/raw/composable/statushistory/panelcfg/x/StatusHistoryPanelCfg_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/statushistory/panelcfg/x/StatusHistoryPanelCfg_types.gen.ts
@@ -10,7 +10,7 @@
 
 import * as ui from '@grafana/schema';
 
-export const pluginVersion = "12.0.3";
+export const pluginVersion = "12.0.4";
 
 export interface Options extends ui.OptionsWithLegend, ui.OptionsWithTooltip, ui.OptionsWithTimezones {
   /**
diff --git a/packages/grafana-schema/src/raw/composable/table/panelcfg/x/TablePanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/table/panelcfg/x/TablePanelCfg_types.gen.ts
index d039e32cc8d..d2667b49388 100644
--- a/packages/grafana-schema/src/raw/composable/table/panelcfg/x/TablePanelCfg_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/table/panelcfg/x/TablePanelCfg_types.gen.ts
@@ -10,7 +10,7 @@
 
 import * as ui from '@grafana/schema';
 
-export const pluginVersion = "12.0.3";
+export const pluginVersion = "12.0.4";
 
 export interface Options {
   /**
diff --git a/packages/grafana-schema/src/raw/composable/text/panelcfg/x/TextPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/text/panelcfg/x/TextPanelCfg_types.gen.ts
index 558a6e51bb5..0203f427f97 100644
--- a/packages/grafana-schema/src/raw/composable/text/panelcfg/x/TextPanelCfg_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/text/panelcfg/x/TextPanelCfg_types.gen.ts
@@ -8,7 +8,7 @@
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
-export const pluginVersion = "12.0.3";
+export const pluginVersion = "12.0.4";
 
 export enum TextMode {
   Code = 'code',
diff --git a/packages/grafana-schema/src/raw/composable/timeseries/panelcfg/x/TimeSeriesPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/timeseries/panelcfg/x/TimeSeriesPanelCfg_types.gen.ts
index c917e3ddd8a..83e25e6f046 100644
--- a/packages/grafana-schema/src/raw/composable/timeseries/panelcfg/x/TimeSeriesPanelCfg_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/timeseries/panelcfg/x/TimeSeriesPanelCfg_types.gen.ts
@@ -10,7 +10,7 @@
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "12.0.3";
+export const pluginVersion = "12.0.4";
 
 export interface Options extends common.OptionsWithTimezones {
   legend: common.VizLegendOptions;
diff --git a/packages/grafana-schema/src/raw/composable/trend/panelcfg/x/TrendPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/trend/panelcfg/x/TrendPanelCfg_types.gen.ts
index d408913e197..c4f842249d5 100644
--- a/packages/grafana-schema/src/raw/composable/trend/panelcfg/x/TrendPanelCfg_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/trend/panelcfg/x/TrendPanelCfg_types.gen.ts
@@ -10,7 +10,7 @@
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "12.0.3";
+export const pluginVersion = "12.0.4";
 
 /**
  * Identical to timeseries... except it does not have timezone settings
diff --git a/packages/grafana-schema/src/raw/composable/xychart/panelcfg/x/XYChartPanelCfg_types.gen.ts b/packages/grafana-schema/src/raw/composable/xychart/panelcfg/x/XYChartPanelCfg_types.gen.ts
index 5be486dcd0f..c0d526d416c 100644
--- a/packages/grafana-schema/src/raw/composable/xychart/panelcfg/x/XYChartPanelCfg_types.gen.ts
+++ b/packages/grafana-schema/src/raw/composable/xychart/panelcfg/x/XYChartPanelCfg_types.gen.ts
@@ -10,7 +10,7 @@
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "12.0.3";
+export const pluginVersion = "12.0.4";
 
 export enum PointShape {
   Circle = 'circle',
diff --git a/packages/grafana-sql/package.json b/packages/grafana-sql/package.json
index 3c11bc01644..b67f1a8b791 100644
--- a/packages/grafana-sql/package.json
+++ b/packages/grafana-sql/package.json
@@ -3,7 +3,7 @@
   "license": "AGPL-3.0-only",
   "private": true,
   "name": "@grafana/sql",
-  "version": "12.0.3",
+  "version": "12.0.4",
   "repository": {
     "type": "git",
     "url": "http://github.com/grafana/grafana.git",
@@ -15,11 +15,11 @@
   },
   "dependencies": {
     "@emotion/css": "11.13.5",
-    "@grafana/data": "12.0.3",
-    "@grafana/e2e-selectors": "12.0.3",
+    "@grafana/data": "12.0.4",
+    "@grafana/e2e-selectors": "12.0.4",
     "@grafana/plugin-ui": "0.10.5",
-    "@grafana/runtime": "12.0.3",
-    "@grafana/ui": "12.0.3",
+    "@grafana/runtime": "12.0.4",
+    "@grafana/ui": "12.0.4",
     "@react-awesome-query-builder/ui": "6.6.14",
     "immutable": "5.0.3",
     "lodash": "4.17.21",
diff --git a/packages/grafana-ui/package.json b/packages/grafana-ui/package.json
index dea078b976f..867f8303d8b 100644
--- a/packages/grafana-ui/package.json
+++ b/packages/grafana-ui/package.json
@@ -2,7 +2,7 @@
   "author": "Grafana Labs",
   "license": "Apache-2.0",
   "name": "@grafana/ui",
-  "version": "12.0.3",
+  "version": "12.0.4",
   "description": "Grafana Components Library",
   "keywords": [
     "grafana",
@@ -66,10 +66,10 @@
     "@emotion/react": "11.14.0",
     "@emotion/serialize": "1.3.3",
     "@floating-ui/react": "0.27.7",
-    "@grafana/data": "12.0.3",
-    "@grafana/e2e-selectors": "12.0.3",
+    "@grafana/data": "12.0.4",
+    "@grafana/e2e-selectors": "12.0.4",
     "@grafana/faro-web-sdk": "^1.13.2",
-    "@grafana/schema": "12.0.3",
+    "@grafana/schema": "12.0.4",
     "@hello-pangea/dnd": "17.0.0",
     "@leeoniya/ufuzzy": "1.0.18",
     "@monaco-editor/react": "4.6.0",
diff --git a/public/app/plugins/datasource/azuremonitor/package.json b/public/app/plugins/datasource/azuremonitor/package.json
index fccd5ef2678..3d6a8ad2dd3 100644
--- a/public/app/plugins/datasource/azuremonitor/package.json
+++ b/public/app/plugins/datasource/azuremonitor/package.json
@@ -2,14 +2,14 @@
   "name": "@grafana-plugins/grafana-azure-monitor-datasource",
   "description": "Grafana data source for Azure Monitor",
   "private": true,
-  "version": "12.0.3",
+  "version": "12.0.4",
   "dependencies": {
     "@emotion/css": "11.13.5",
-    "@grafana/data": "12.0.3",
+    "@grafana/data": "12.0.4",
     "@grafana/plugin-ui": "0.10.5",
-    "@grafana/runtime": "12.0.3",
-    "@grafana/schema": "12.0.3",
-    "@grafana/ui": "12.0.3",
+    "@grafana/runtime": "12.0.4",
+    "@grafana/schema": "12.0.4",
+    "@grafana/ui": "12.0.4",
     "@kusto/monaco-kusto": "^10.0.0",
     "fast-deep-equal": "^3.1.3",
     "i18next": "^24.0.0",
@@ -25,8 +25,8 @@
     "tslib": "2.8.1"
   },
   "devDependencies": {
-    "@grafana/e2e-selectors": "12.0.3",
-    "@grafana/plugin-configs": "12.0.3",
+    "@grafana/e2e-selectors": "12.0.4",
+    "@grafana/plugin-configs": "12.0.4",
     "@testing-library/dom": "10.4.0",
     "@testing-library/jest-dom": "6.6.3",
     "@testing-library/react": "16.2.0",
diff --git a/public/app/plugins/datasource/cloud-monitoring/package.json b/public/app/plugins/datasource/cloud-monitoring/package.json
index 07e57fbef80..c66462a40e2 100644
--- a/public/app/plugins/datasource/cloud-monitoring/package.json
+++ b/public/app/plugins/datasource/cloud-monitoring/package.json
@@ -2,15 +2,15 @@
   "name": "@grafana-plugins/stackdriver",
   "description": "Grafana data source for Google Cloud Monitoring",
   "private": true,
-  "version": "12.0.3",
+  "version": "12.0.4",
   "dependencies": {
     "@emotion/css": "11.13.5",
-    "@grafana/data": "12.0.3",
+    "@grafana/data": "12.0.4",
     "@grafana/google-sdk": "0.1.2",
     "@grafana/plugin-ui": "0.10.5",
-    "@grafana/runtime": "12.0.3",
-    "@grafana/schema": "12.0.3",
-    "@grafana/ui": "12.0.3",
+    "@grafana/runtime": "12.0.4",
+    "@grafana/schema": "12.0.4",
+    "@grafana/ui": "12.0.4",
     "debounce-promise": "3.1.2",
     "fast-deep-equal": "^3.1.3",
     "i18next": "^24.0.0",
@@ -26,8 +26,8 @@
     "tslib": "2.8.1"
   },
   "devDependencies": {
-    "@grafana/e2e-selectors": "12.0.3",
-    "@grafana/plugin-configs": "12.0.3",
+    "@grafana/e2e-selectors": "12.0.4",
+    "@grafana/plugin-configs": "12.0.4",
     "@testing-library/dom": "10.4.0",
     "@testing-library/jest-dom": "6.6.3",
     "@testing-library/react": "16.2.0",
diff --git a/public/app/plugins/datasource/grafana-postgresql-datasource/package.json b/public/app/plugins/datasource/grafana-postgresql-datasource/package.json
index d6a1642dba2..6902c5a5955 100644
--- a/public/app/plugins/datasource/grafana-postgresql-datasource/package.json
+++ b/public/app/plugins/datasource/grafana-postgresql-datasource/package.json
@@ -2,22 +2,22 @@
   "name": "@grafana-plugins/grafana-postgresql-datasource",
   "description": "PostgreSQL data source plugin",
   "private": true,
-  "version": "12.0.3",
+  "version": "12.0.4",
   "dependencies": {
     "@emotion/css": "11.13.5",
-    "@grafana/data": "12.0.3",
+    "@grafana/data": "12.0.4",
     "@grafana/plugin-ui": "0.10.5",
-    "@grafana/runtime": "12.0.3",
-    "@grafana/sql": "12.0.3",
-    "@grafana/ui": "12.0.3",
+    "@grafana/runtime": "12.0.4",
+    "@grafana/sql": "12.0.4",
+    "@grafana/ui": "12.0.4",
     "lodash": "4.17.21",
     "react": "18.3.1",
     "rxjs": "7.8.1",
     "tslib": "2.8.1"
   },
   "devDependencies": {
-    "@grafana/e2e-selectors": "12.0.3",
-    "@grafana/plugin-configs": "12.0.3",
+    "@grafana/e2e-selectors": "12.0.4",
+    "@grafana/plugin-configs": "12.0.4",
     "@testing-library/dom": "10.4.0",
     "@testing-library/react": "16.2.0",
     "@testing-library/user-event": "14.6.1",
diff --git a/public/app/plugins/datasource/grafana-pyroscope-datasource/package.json b/public/app/plugins/datasource/grafana-pyroscope-datasource/package.json
index 94375d4dbdf..9e79b74097f 100644
--- a/public/app/plugins/datasource/grafana-pyroscope-datasource/package.json
+++ b/public/app/plugins/datasource/grafana-pyroscope-datasource/package.json
@@ -2,13 +2,13 @@
   "name": "@grafana-plugins/grafana-pyroscope-datasource",
   "description": "Continuous profiling for analysis of CPU and memory usage, down to the line number and throughout time. Saving infrastructure cost, improving performance, and increasing reliability.",
   "private": true,
-  "version": "12.0.3",
+  "version": "12.0.4",
   "dependencies": {
     "@emotion/css": "11.13.5",
-    "@grafana/data": "12.0.3",
-    "@grafana/runtime": "12.0.3",
-    "@grafana/schema": "12.0.3",
-    "@grafana/ui": "12.0.3",
+    "@grafana/data": "12.0.4",
+    "@grafana/runtime": "12.0.4",
+    "@grafana/schema": "12.0.4",
+    "@grafana/ui": "12.0.4",
     "fast-deep-equal": "^3.1.3",
     "lodash": "4.17.21",
     "monaco-editor": "0.34.1",
@@ -20,7 +20,7 @@
     "tslib": "2.8.1"
   },
   "devDependencies": {
-    "@grafana/plugin-configs": "12.0.3",
+    "@grafana/plugin-configs": "12.0.4",
     "@testing-library/dom": "10.4.0",
     "@testing-library/jest-dom": "6.6.3",
     "@testing-library/react": "16.2.0",
diff --git a/public/app/plugins/datasource/grafana-testdata-datasource/package.json b/public/app/plugins/datasource/grafana-testdata-datasource/package.json
index 2e38f5009a5..69d45f7cf2e 100644
--- a/public/app/plugins/datasource/grafana-testdata-datasource/package.json
+++ b/public/app/plugins/datasource/grafana-testdata-datasource/package.json
@@ -2,13 +2,13 @@
   "name": "@grafana-plugins/grafana-testdata-datasource",
   "description": "Generates test data in different forms",
   "private": true,
-  "version": "12.0.3",
+  "version": "12.0.4",
   "dependencies": {
     "@emotion/css": "11.13.5",
-    "@grafana/data": "12.0.3",
-    "@grafana/runtime": "12.0.3",
-    "@grafana/schema": "12.0.3",
-    "@grafana/ui": "12.0.3",
+    "@grafana/data": "12.0.4",
+    "@grafana/runtime": "12.0.4",
+    "@grafana/schema": "12.0.4",
+    "@grafana/ui": "12.0.4",
     "d3-random": "^3.0.1",
     "lodash": "4.17.21",
     "micro-memoize": "^4.1.2",
@@ -21,8 +21,8 @@
     "uuid": "11.0.5"
   },
   "devDependencies": {
-    "@grafana/e2e-selectors": "12.0.3",
-    "@grafana/plugin-configs": "12.0.3",
+    "@grafana/e2e-selectors": "12.0.4",
+    "@grafana/plugin-configs": "12.0.4",
     "@testing-library/dom": "10.4.0",
     "@testing-library/react": "16.2.0",
     "@testing-library/user-event": "14.6.1",
diff --git a/public/app/plugins/datasource/jaeger/package.json b/public/app/plugins/datasource/jaeger/package.json
index fc1a17345c7..f8f33d11893 100644
--- a/public/app/plugins/datasource/jaeger/package.json
+++ b/public/app/plugins/datasource/jaeger/package.json
@@ -2,7 +2,7 @@
   "name": "@grafana-plugins/jaeger",
   "description": "Jaeger plugin for Grafana",
   "private": true,
-  "version": "12.0.3",
+  "version": "12.0.4",
   "dependencies": {
     "@emotion/css": "11.13.5",
     "@grafana/data": "workspace:*",
diff --git a/public/app/plugins/datasource/mssql/package.json b/public/app/plugins/datasource/mssql/package.json
index 95d7cb9e52d..26ce1c2f7b7 100644
--- a/public/app/plugins/datasource/mssql/package.json
+++ b/public/app/plugins/datasource/mssql/package.json
@@ -2,22 +2,22 @@
   "name": "@grafana-plugins/mssql",
   "description": "MSSQL data source plugin",
   "private": true,
-  "version": "12.0.3",
+  "version": "12.0.4",
   "dependencies": {
     "@emotion/css": "11.13.5",
-    "@grafana/data": "12.0.3",
+    "@grafana/data": "12.0.4",
     "@grafana/plugin-ui": "0.10.5",
-    "@grafana/runtime": "12.0.3",
-    "@grafana/sql": "12.0.3",
-    "@grafana/ui": "12.0.3",
+    "@grafana/runtime": "12.0.4",
+    "@grafana/sql": "12.0.4",
+    "@grafana/ui": "12.0.4",
     "lodash": "4.17.21",
     "react": "18.3.1",
     "rxjs": "7.8.1",
     "tslib": "2.8.1"
   },
   "devDependencies": {
-    "@grafana/e2e-selectors": "12.0.3",
-    "@grafana/plugin-configs": "12.0.3",
+    "@grafana/e2e-selectors": "12.0.4",
+    "@grafana/plugin-configs": "12.0.4",
     "@testing-library/dom": "10.4.0",
     "@testing-library/react": "16.2.0",
     "@testing-library/user-event": "14.6.1",
diff --git a/public/app/plugins/datasource/mysql/package.json b/public/app/plugins/datasource/mysql/package.json
index f12d732b865..edfd0178a80 100644
--- a/public/app/plugins/datasource/mysql/package.json
+++ b/public/app/plugins/datasource/mysql/package.json
@@ -2,22 +2,22 @@
   "name": "@grafana-plugins/mysql",
   "description": "MySQL data source plugin",
   "private": true,
-  "version": "12.0.3",
+  "version": "12.0.4",
   "dependencies": {
     "@emotion/css": "11.13.5",
-    "@grafana/data": "12.0.3",
+    "@grafana/data": "12.0.4",
     "@grafana/plugin-ui": "0.10.5",
-    "@grafana/runtime": "12.0.3",
-    "@grafana/sql": "12.0.3",
-    "@grafana/ui": "12.0.3",
+    "@grafana/runtime": "12.0.4",
+    "@grafana/sql": "12.0.4",
+    "@grafana/ui": "12.0.4",
     "lodash": "4.17.21",
     "react": "18.3.1",
     "rxjs": "7.8.1",
     "tslib": "2.8.1"
   },
   "devDependencies": {
-    "@grafana/e2e-selectors": "12.0.3",
-    "@grafana/plugin-configs": "12.0.3",
+    "@grafana/e2e-selectors": "12.0.4",
+    "@grafana/plugin-configs": "12.0.4",
     "@testing-library/dom": "10.4.0",
     "@testing-library/react": "16.2.0",
     "@testing-library/user-event": "14.6.1",
diff --git a/public/app/plugins/datasource/parca/package.json b/public/app/plugins/datasource/parca/package.json
index ec35d49ec60..3289ecba681 100644
--- a/public/app/plugins/datasource/parca/package.json
+++ b/public/app/plugins/datasource/parca/package.json
@@ -2,13 +2,13 @@
   "name": "@grafana-plugins/parca",
   "description": "Continuous profiling for analysis of CPU and memory usage, down to the line number and throughout time. Saving infrastructure cost, improving performance, and increasing reliability.",
   "private": true,
-  "version": "12.0.3",
+  "version": "12.0.4",
   "dependencies": {
     "@emotion/css": "11.13.5",
-    "@grafana/data": "12.0.3",
-    "@grafana/runtime": "12.0.3",
-    "@grafana/schema": "12.0.3",
-    "@grafana/ui": "12.0.3",
+    "@grafana/data": "12.0.4",
+    "@grafana/runtime": "12.0.4",
+    "@grafana/schema": "12.0.4",
+    "@grafana/ui": "12.0.4",
     "lodash": "4.17.21",
     "monaco-editor": "0.34.1",
     "react": "18.3.1",
@@ -18,7 +18,7 @@
     "tslib": "2.8.1"
   },
   "devDependencies": {
-    "@grafana/plugin-configs": "12.0.3",
+    "@grafana/plugin-configs": "12.0.4",
     "@testing-library/dom": "10.4.0",
     "@testing-library/react": "16.2.0",
     "@testing-library/user-event": "14.6.1",
diff --git a/public/app/plugins/datasource/tempo/package.json b/public/app/plugins/datasource/tempo/package.json
index fe454df7136..40df1e73ae3 100644
--- a/public/app/plugins/datasource/tempo/package.json
+++ b/public/app/plugins/datasource/tempo/package.json
@@ -2,7 +2,7 @@
   "name": "@grafana-plugins/tempo",
   "description": "Grafana plugin for the Tempo data source.",
   "private": true,
-  "version": "12.0.3",
+  "version": "12.0.4",
   "dependencies": {
     "@emotion/css": "11.13.5",
     "@grafana/data": "workspace:*",
@@ -39,7 +39,7 @@
     "uuid": "11.0.5"
   },
   "devDependencies": {
-    "@grafana/plugin-configs": "12.0.3",
+    "@grafana/plugin-configs": "12.0.4",
     "@testing-library/dom": "10.4.0",
     "@testing-library/jest-dom": "6.6.3",
     "@testing-library/react": "16.2.0",
diff --git a/public/app/plugins/datasource/zipkin/package.json b/public/app/plugins/datasource/zipkin/package.json
index 8b265812962..6591cf8ba37 100644
--- a/public/app/plugins/datasource/zipkin/package.json
+++ b/public/app/plugins/datasource/zipkin/package.json
@@ -2,7 +2,7 @@
   "name": "@grafana-plugins/zipkin",
   "description": "Zipkin plugin for Grafana",
   "private": true,
-  "version": "12.0.3",
+  "version": "12.0.4",
   "dependencies": {
     "@emotion/css": "11.13.5",
     "@grafana/data": "workspace:*",
diff --git a/yarn.lock b/yarn.lock
index b699d102da5..1502b637a14 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2476,13 +2476,13 @@ __metadata:
   resolution: "@grafana-plugins/grafana-azure-monitor-datasource@workspace:public/app/plugins/datasource/azuremonitor"
   dependencies:
     "@emotion/css": "npm:11.13.5"
-    "@grafana/data": "npm:12.0.3"
-    "@grafana/e2e-selectors": "npm:12.0.3"
-    "@grafana/plugin-configs": "npm:12.0.3"
+    "@grafana/data": "npm:12.0.4"
+    "@grafana/e2e-selectors": "npm:12.0.4"
+    "@grafana/plugin-configs": "npm:12.0.4"
     "@grafana/plugin-ui": "npm:0.10.5"
-    "@grafana/runtime": "npm:12.0.3"
-    "@grafana/schema": "npm:12.0.3"
-    "@grafana/ui": "npm:12.0.3"
+    "@grafana/runtime": "npm:12.0.4"
+    "@grafana/schema": "npm:12.0.4"
+    "@grafana/ui": "npm:12.0.4"
     "@kusto/monaco-kusto": "npm:^10.0.0"
     "@testing-library/dom": "npm:10.4.0"
     "@testing-library/jest-dom": "npm:6.6.3"
@@ -2520,13 +2520,13 @@ __metadata:
   resolution: "@grafana-plugins/grafana-postgresql-datasource@workspace:public/app/plugins/datasource/grafana-postgresql-datasource"
   dependencies:
     "@emotion/css": "npm:11.13.5"
-    "@grafana/data": "npm:12.0.3"
-    "@grafana/e2e-selectors": "npm:12.0.3"
-    "@grafana/plugin-configs": "npm:12.0.3"
+    "@grafana/data": "npm:12.0.4"
+    "@grafana/e2e-selectors": "npm:12.0.4"
+    "@grafana/plugin-configs": "npm:12.0.4"
     "@grafana/plugin-ui": "npm:0.10.5"
-    "@grafana/runtime": "npm:12.0.3"
-    "@grafana/sql": "npm:12.0.3"
-    "@grafana/ui": "npm:12.0.3"
+    "@grafana/runtime": "npm:12.0.4"
+    "@grafana/sql": "npm:12.0.4"
+    "@grafana/ui": "npm:12.0.4"
     "@testing-library/dom": "npm:10.4.0"
     "@testing-library/react": "npm:16.2.0"
     "@testing-library/user-event": "npm:14.6.1"
@@ -2551,11 +2551,11 @@ __metadata:
   resolution: "@grafana-plugins/grafana-pyroscope-datasource@workspace:public/app/plugins/datasource/grafana-pyroscope-datasource"
   dependencies:
     "@emotion/css": "npm:11.13.5"
-    "@grafana/data": "npm:12.0.3"
-    "@grafana/plugin-configs": "npm:12.0.3"
-    "@grafana/runtime": "npm:12.0.3"
-    "@grafana/schema": "npm:12.0.3"
-    "@grafana/ui": "npm:12.0.3"
+    "@grafana/data": "npm:12.0.4"
+    "@grafana/plugin-configs": "npm:12.0.4"
+    "@grafana/runtime": "npm:12.0.4"
+    "@grafana/schema": "npm:12.0.4"
+    "@grafana/ui": "npm:12.0.4"
     "@testing-library/dom": "npm:10.4.0"
     "@testing-library/jest-dom": "npm:6.6.3"
     "@testing-library/react": "npm:16.2.0"
@@ -2591,12 +2591,12 @@ __metadata:
   resolution: "@grafana-plugins/grafana-testdata-datasource@workspace:public/app/plugins/datasource/grafana-testdata-datasource"
   dependencies:
     "@emotion/css": "npm:11.13.5"
-    "@grafana/data": "npm:12.0.3"
-    "@grafana/e2e-selectors": "npm:12.0.3"
-    "@grafana/plugin-configs": "npm:12.0.3"
-    "@grafana/runtime": "npm:12.0.3"
-    "@grafana/schema": "npm:12.0.3"
-    "@grafana/ui": "npm:12.0.3"
+    "@grafana/data": "npm:12.0.4"
+    "@grafana/e2e-selectors": "npm:12.0.4"
+    "@grafana/plugin-configs": "npm:12.0.4"
+    "@grafana/runtime": "npm:12.0.4"
+    "@grafana/schema": "npm:12.0.4"
+    "@grafana/ui": "npm:12.0.4"
     "@testing-library/dom": "npm:10.4.0"
     "@testing-library/react": "npm:16.2.0"
     "@testing-library/user-event": "npm:14.6.1"
@@ -2672,13 +2672,13 @@ __metadata:
   resolution: "@grafana-plugins/mssql@workspace:public/app/plugins/datasource/mssql"
   dependencies:
     "@emotion/css": "npm:11.13.5"
-    "@grafana/data": "npm:12.0.3"
-    "@grafana/e2e-selectors": "npm:12.0.3"
-    "@grafana/plugin-configs": "npm:12.0.3"
+    "@grafana/data": "npm:12.0.4"
+    "@grafana/e2e-selectors": "npm:12.0.4"
+    "@grafana/plugin-configs": "npm:12.0.4"
     "@grafana/plugin-ui": "npm:0.10.5"
-    "@grafana/runtime": "npm:12.0.3"
-    "@grafana/sql": "npm:12.0.3"
-    "@grafana/ui": "npm:12.0.3"
+    "@grafana/runtime": "npm:12.0.4"
+    "@grafana/sql": "npm:12.0.4"
+    "@grafana/ui": "npm:12.0.4"
     "@testing-library/dom": "npm:10.4.0"
     "@testing-library/react": "npm:16.2.0"
     "@testing-library/user-event": "npm:14.6.1"
@@ -2703,13 +2703,13 @@ __metadata:
   resolution: "@grafana-plugins/mysql@workspace:public/app/plugins/datasource/mysql"
   dependencies:
     "@emotion/css": "npm:11.13.5"
-    "@grafana/data": "npm:12.0.3"
-    "@grafana/e2e-selectors": "npm:12.0.3"
-    "@grafana/plugin-configs": "npm:12.0.3"
+    "@grafana/data": "npm:12.0.4"
+    "@grafana/e2e-selectors": "npm:12.0.4"
+    "@grafana/plugin-configs": "npm:12.0.4"
     "@grafana/plugin-ui": "npm:0.10.5"
-    "@grafana/runtime": "npm:12.0.3"
-    "@grafana/sql": "npm:12.0.3"
-    "@grafana/ui": "npm:12.0.3"
+    "@grafana/runtime": "npm:12.0.4"
+    "@grafana/sql": "npm:12.0.4"
+    "@grafana/ui": "npm:12.0.4"
     "@testing-library/dom": "npm:10.4.0"
     "@testing-library/react": "npm:16.2.0"
     "@testing-library/user-event": "npm:14.6.1"
@@ -2734,11 +2734,11 @@ __metadata:
   resolution: "@grafana-plugins/parca@workspace:public/app/plugins/datasource/parca"
   dependencies:
     "@emotion/css": "npm:11.13.5"
-    "@grafana/data": "npm:12.0.3"
-    "@grafana/plugin-configs": "npm:12.0.3"
-    "@grafana/runtime": "npm:12.0.3"
-    "@grafana/schema": "npm:12.0.3"
-    "@grafana/ui": "npm:12.0.3"
+    "@grafana/data": "npm:12.0.4"
+    "@grafana/plugin-configs": "npm:12.0.4"
+    "@grafana/runtime": "npm:12.0.4"
+    "@grafana/schema": "npm:12.0.4"
+    "@grafana/ui": "npm:12.0.4"
     "@testing-library/dom": "npm:10.4.0"
     "@testing-library/react": "npm:16.2.0"
     "@testing-library/user-event": "npm:14.6.1"
@@ -2766,14 +2766,14 @@ __metadata:
   resolution: "@grafana-plugins/stackdriver@workspace:public/app/plugins/datasource/cloud-monitoring"
   dependencies:
     "@emotion/css": "npm:11.13.5"
-    "@grafana/data": "npm:12.0.3"
-    "@grafana/e2e-selectors": "npm:12.0.3"
+    "@grafana/data": "npm:12.0.4"
+    "@grafana/e2e-selectors": "npm:12.0.4"
     "@grafana/google-sdk": "npm:0.1.2"
-    "@grafana/plugin-configs": "npm:12.0.3"
+    "@grafana/plugin-configs": "npm:12.0.4"
     "@grafana/plugin-ui": "npm:0.10.5"
-    "@grafana/runtime": "npm:12.0.3"
-    "@grafana/schema": "npm:12.0.3"
-    "@grafana/ui": "npm:12.0.3"
+    "@grafana/runtime": "npm:12.0.4"
+    "@grafana/schema": "npm:12.0.4"
+    "@grafana/ui": "npm:12.0.4"
     "@testing-library/dom": "npm:10.4.0"
     "@testing-library/jest-dom": "npm:6.6.3"
     "@testing-library/react": "npm:16.2.0"
@@ -2818,7 +2818,7 @@ __metadata:
     "@grafana/lezer-traceql": "npm:0.0.21"
     "@grafana/monaco-logql": "npm:^0.0.8"
     "@grafana/o11y-ds-frontend": "workspace:*"
-    "@grafana/plugin-configs": "npm:12.0.3"
+    "@grafana/plugin-configs": "npm:12.0.4"
     "@grafana/plugin-ui": "npm:0.10.5"
     "@grafana/runtime": "workspace:*"
     "@grafana/schema": "workspace:*"
@@ -2931,12 +2931,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@grafana/data@npm:12.0.3, @grafana/data@workspace:*, @grafana/data@workspace:packages/grafana-data":
+"@grafana/data@npm:12.0.4, @grafana/data@workspace:*, @grafana/data@workspace:packages/grafana-data":
   version: 0.0.0-use.local
   resolution: "@grafana/data@workspace:packages/grafana-data"
   dependencies:
     "@braintree/sanitize-url": "npm:7.0.1"
-    "@grafana/schema": "npm:12.0.3"
+    "@grafana/schema": "npm:12.0.4"
     "@grafana/tsconfig": "npm:^2.0.0"
     "@rollup/plugin-node-resolve": "npm:16.0.0"
     "@types/d3-interpolate": "npm:^3.0.0"
@@ -2984,7 +2984,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@grafana/e2e-selectors@npm:12.0.3, @grafana/e2e-selectors@workspace:*, @grafana/e2e-selectors@workspace:packages/grafana-e2e-selectors":
+"@grafana/e2e-selectors@npm:12.0.4, @grafana/e2e-selectors@workspace:*, @grafana/e2e-selectors@workspace:packages/grafana-e2e-selectors":
   version: 0.0.0-use.local
   resolution: "@grafana/e2e-selectors@workspace:packages/grafana-e2e-selectors"
   dependencies:
@@ -3087,9 +3087,9 @@ __metadata:
     "@babel/preset-env": "npm:7.26.9"
     "@babel/preset-react": "npm:7.26.3"
     "@emotion/css": "npm:11.13.5"
-    "@grafana/data": "npm:12.0.3"
+    "@grafana/data": "npm:12.0.4"
     "@grafana/tsconfig": "npm:^2.0.0"
-    "@grafana/ui": "npm:12.0.3"
+    "@grafana/ui": "npm:12.0.4"
     "@leeoniya/ufuzzy": "npm:1.0.18"
     "@rollup/plugin-node-resolve": "npm:16.0.0"
     "@testing-library/dom": "npm:10.4.0"
@@ -3196,13 +3196,13 @@ __metadata:
   resolution: "@grafana/o11y-ds-frontend@workspace:packages/grafana-o11y-ds-frontend"
   dependencies:
     "@emotion/css": "npm:11.13.5"
-    "@grafana/data": "npm:12.0.3"
-    "@grafana/e2e-selectors": "npm:12.0.3"
+    "@grafana/data": "npm:12.0.4"
+    "@grafana/e2e-selectors": "npm:12.0.4"
     "@grafana/plugin-ui": "npm:0.10.5"
-    "@grafana/runtime": "npm:12.0.3"
-    "@grafana/schema": "npm:12.0.3"
+    "@grafana/runtime": "npm:12.0.4"
+    "@grafana/schema": "npm:12.0.4"
     "@grafana/tsconfig": "npm:^2.0.0"
-    "@grafana/ui": "npm:12.0.3"
+    "@grafana/ui": "npm:12.0.4"
     "@testing-library/dom": "npm:10.4.0"
     "@testing-library/jest-dom": "npm:^6.1.2"
     "@testing-library/react": "npm:16.2.0"
@@ -3226,7 +3226,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@grafana/plugin-configs@npm:12.0.3, @grafana/plugin-configs@workspace:*, @grafana/plugin-configs@workspace:packages/grafana-plugin-configs":
+"@grafana/plugin-configs@npm:12.0.4, @grafana/plugin-configs@workspace:*, @grafana/plugin-configs@workspace:packages/grafana-plugin-configs":
   version: 0.0.0-use.local
   resolution: "@grafana/plugin-configs@workspace:packages/grafana-plugin-configs"
   dependencies:
@@ -3326,13 +3326,13 @@ __metadata:
   dependencies:
     "@emotion/css": "npm:11.13.5"
     "@floating-ui/react": "npm:0.27.7"
-    "@grafana/data": "npm:12.0.3"
-    "@grafana/e2e-selectors": "npm:12.0.3"
+    "@grafana/data": "npm:12.0.4"
+    "@grafana/e2e-selectors": "npm:12.0.4"
     "@grafana/plugin-ui": "npm:0.10.5"
-    "@grafana/runtime": "npm:12.0.3"
-    "@grafana/schema": "npm:12.0.3"
+    "@grafana/runtime": "npm:12.0.4"
+    "@grafana/schema": "npm:12.0.4"
     "@grafana/tsconfig": "npm:^2.0.0"
-    "@grafana/ui": "npm:12.0.3"
+    "@grafana/ui": "npm:12.0.4"
     "@hello-pangea/dnd": "npm:17.0.0"
     "@leeoniya/ufuzzy": "npm:1.0.18"
     "@lezer/common": "npm:1.2.3"
@@ -3388,16 +3388,16 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@grafana/runtime@npm:12.0.3, @grafana/runtime@workspace:*, @grafana/runtime@workspace:packages/grafana-runtime":
+"@grafana/runtime@npm:12.0.4, @grafana/runtime@workspace:*, @grafana/runtime@workspace:packages/grafana-runtime":
   version: 0.0.0-use.local
   resolution: "@grafana/runtime@workspace:packages/grafana-runtime"
   dependencies:
-    "@grafana/data": "npm:12.0.3"
-    "@grafana/e2e-selectors": "npm:12.0.3"
+    "@grafana/data": "npm:12.0.4"
+    "@grafana/e2e-selectors": "npm:12.0.4"
     "@grafana/faro-web-sdk": "npm:^1.13.2"
-    "@grafana/schema": "npm:12.0.3"
+    "@grafana/schema": "npm:12.0.4"
     "@grafana/tsconfig": "npm:^2.0.0"
-    "@grafana/ui": "npm:12.0.3"
+    "@grafana/ui": "npm:12.0.4"
     "@rollup/plugin-node-resolve": "npm:16.0.0"
     "@rollup/plugin-terser": "npm:0.4.4"
     "@testing-library/dom": "npm:10.4.0"
@@ -3510,7 +3510,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@grafana/schema@npm:12.0.3, @grafana/schema@workspace:*, @grafana/schema@workspace:packages/grafana-schema":
+"@grafana/schema@npm:12.0.4, @grafana/schema@workspace:*, @grafana/schema@workspace:packages/grafana-schema":
   version: 0.0.0-use.local
   resolution: "@grafana/schema@workspace:packages/grafana-schema"
   dependencies:
@@ -3528,17 +3528,17 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@grafana/sql@npm:12.0.3, @grafana/sql@workspace:*, @grafana/sql@workspace:packages/grafana-sql":
+"@grafana/sql@npm:12.0.4, @grafana/sql@workspace:*, @grafana/sql@workspace:packages/grafana-sql":
   version: 0.0.0-use.local
   resolution: "@grafana/sql@workspace:packages/grafana-sql"
   dependencies:
     "@emotion/css": "npm:11.13.5"
-    "@grafana/data": "npm:12.0.3"
-    "@grafana/e2e-selectors": "npm:12.0.3"
+    "@grafana/data": "npm:12.0.4"
+    "@grafana/e2e-selectors": "npm:12.0.4"
     "@grafana/plugin-ui": "npm:0.10.5"
-    "@grafana/runtime": "npm:12.0.3"
+    "@grafana/runtime": "npm:12.0.4"
     "@grafana/tsconfig": "npm:^2.0.0"
-    "@grafana/ui": "npm:12.0.3"
+    "@grafana/ui": "npm:12.0.4"
     "@react-awesome-query-builder/ui": "npm:6.6.14"
     "@testing-library/dom": "npm:10.4.0"
     "@testing-library/jest-dom": "npm:^6.1.2"
@@ -3579,7 +3579,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@grafana/ui@npm:12.0.3, @grafana/ui@workspace:*, @grafana/ui@workspace:packages/grafana-ui":
+"@grafana/ui@npm:12.0.4, @grafana/ui@workspace:*, @grafana/ui@workspace:packages/grafana-ui":
   version: 0.0.0-use.local
   resolution: "@grafana/ui@workspace:packages/grafana-ui"
   dependencies:
@@ -3589,10 +3589,10 @@ __metadata:
     "@emotion/serialize": "npm:1.3.3"
     "@faker-js/faker": "npm:^9.0.0"
     "@floating-ui/react": "npm:0.27.7"
-    "@grafana/data": "npm:12.0.3"
-    "@grafana/e2e-selectors": "npm:12.0.3"
+    "@grafana/data": "npm:12.0.4"
+    "@grafana/e2e-selectors": "npm:12.0.4"
     "@grafana/faro-web-sdk": "npm:^1.13.2"
-    "@grafana/schema": "npm:12.0.3"
+    "@grafana/schema": "npm:12.0.4"
     "@grafana/tsconfig": "npm:^2.0.0"
     "@hello-pangea/dnd": "npm:17.0.0"
     "@leeoniya/ufuzzy": "npm:1.0.18"