diff --git a/packages/core/src/v1/config/config.ts b/packages/core/src/v1/config/config.ts
index 2e773f71e256..9cd1d852833e 100644
--- a/packages/core/src/v1/config/config.ts
+++ b/packages/core/src/v1/config/config.ts
@@ -108,7 +108,12 @@ export const Info = Schema.Struct({
     description: "Custom provider configurations and model overrides",
   }),
   mcp: Schema.optional(
-    Schema.Record(Schema.String, Schema.Union([ConfigMCPV1.Info, Schema.Struct({ enabled: Schema.Boolean })])),
+    Schema.Record(
+      Schema.String,
+      Schema.Union([ConfigMCPV1.Info, Schema.Struct({ enabled: Schema.Boolean })]).annotate({
+        discriminator: "type",
+      }),
+    ),
   ).annotate({ description: "MCP (Model Context Protocol) server configurations" }),
   formatter: Schema.optional(ConfigFormatterV1.Info).annotate({
     description: