diff --git a/packages/grafana-data/src/types/data.ts b/packages/grafana-data/src/types/data.ts
index 3063eaa7224..00bf7ae113f 100644
--- a/packages/grafana-data/src/types/data.ts
+++ b/packages/grafana-data/src/types/data.ts
@@ -38,7 +38,7 @@ export type PreferredVisualisationType = typeof preferredVisualizationTypes[numb
 export interface QueryResultMeta {
   type?: DataFrameType;
 
-  /** DatasSource Specific Values */
+  /** DataSource Specific Values */
   custom?: Record<string, any>;
 
   /** Stats */
diff --git a/packages/grafana-schema/src/common/common.gen.ts b/packages/grafana-schema/src/common/common.gen.ts
index e2f18410125..9557cee3648 100644
--- a/packages/grafana-schema/src/common/common.gen.ts
+++ b/packages/grafana-schema/src/common/common.gen.ts
@@ -8,6 +8,17 @@
 // Run 'make gen-cue' from repository root to regenerate.
 
 
+/**
+ * TODO docs
+ */
+export interface DataSourceJsonData {
+  alertmanagerUid?: string;
+  authType?: string;
+  defaultRegion?: string;
+  manageAlerts?: boolean;
+  profile?: string;
+}
+
 /**
  * These are the common properties available to all queries in all datasources.
  * Specific implementations will *extend* this interface, adding the required
@@ -524,6 +535,14 @@ export enum BarGaugeDisplayMode {
   Lcd = 'lcd',
 }
 
+/**
+ * TODO docs
+ */
+export interface VizTooltipOptions {
+  mode: TooltipDisplayMode;
+  sort: SortOrder;
+}
+
 /**
  * Internally, this is the "type" of cell that's being displayed
  * in the table such as colored text, JSON, gauge, etc.
@@ -648,13 +667,7 @@ export interface FrameGeometrySource {
   wkt?: string;
 }
 
-/**
- * TODO docs
- */
-export interface VizTooltipOptions {
-  mode: TooltipDisplayMode;
-  sort: SortOrder;
-}
+export interface Labels {}
 
 /**
  * Field options for each field within a table (e.g 10, "The String", 64.20, etc.)
diff --git a/packages/grafana-schema/src/common/data_source.cue b/packages/grafana-schema/src/common/data_source.cue
new file mode 100644
index 00000000000..c74c9892fb6
--- /dev/null
+++ b/packages/grafana-schema/src/common/data_source.cue
@@ -0,0 +1,10 @@
+package common
+
+// TODO docs
+DataSourceJsonData: {
+  authType?: string
+  defaultRegion?: string
+  profile?: string
+  manageAlerts?: bool
+  alertmanagerUid?: string
+} @cuetsy(kind="interface")
diff --git a/packages/grafana-schema/src/common/mudball.cue b/packages/grafana-schema/src/common/mudball.cue
index d131253af8d..537c6549570 100644
--- a/packages/grafana-schema/src/common/mudball.cue
+++ b/packages/grafana-schema/src/common/mudball.cue
@@ -245,4 +245,6 @@ VizTooltipOptions: {
 	sort: SortOrder
 } @cuetsy(kind="interface")
 
-
+Labels: {
+	[string]: string
+} @cuetsy(kind="interface")
diff --git a/pkg/kindsys/report.json b/pkg/kindsys/report.json
index 673cd823e10..67d72700ab8 100644
--- a/pkg/kindsys/report.json
+++ b/pkg/kindsys/report.json
@@ -2,7 +2,9 @@
   "kinds": {
     "alertgroupspanelcfg": {
       "category": "composable",
-      "codeowners": [],
+      "codeowners": [
+        "grafana/alerting-squad-frontend"
+      ],
       "currentVersion": [
         0,
         0
@@ -10,10 +12,10 @@
       "grafanaMaturityCount": 0,
       "lineageIsGroup": true,
       "links": {
-        "docs": "https:/grafana.com/docs/grafana/next/developers/kinds/composable/alertgroupspanelcfg/schema-reference",
+        "docs": "https://grafana.com/docs/grafana/next/developers/kinds/composable/alertgroupspanelcfg/schema-reference",
         "go": "n/a",
-        "schema": "https:/github.com/grafana/grafana/tree/main/public/app/plugins/panel/alertGroups/panelcfg.cue",
-        "ts": "https:/github.com/grafana/grafana/tree/main/public/app/plugins/panel/alertGroups/panelcfg.gen.ts"
+        "schema": "https://github.com/grafana/grafana/tree/main/public/app/plugins/panel/alertGroups/panelcfg.cue",
+        "ts": "https://github.com/grafana/grafana/tree/main/public/app/plugins/panel/alertGroups/panelcfg.gen.ts"
       },
       "machineName": "alertgroupspanelcfg",
       "maturity": "merged",