diff --git a/docs/plugins/reference/microsoft-foundry.md b/docs/plugins/reference/microsoft-foundry.md
index c160f4eed0c8..69f18a09ebf8 100644
--- a/docs/plugins/reference/microsoft-foundry.md
+++ b/docs/plugins/reference/microsoft-foundry.md
@@ -74,9 +74,11 @@ name in the request `model` field:
 {
   agents: {
     defaults: {
-      imageGenerationModel: {
-        primary: "microsoft-foundry/<deployment-name>",
-        timeoutMs: 600000,
+      mediaModels: {
+        image: {
+          primary: "microsoft-foundry/<deployment-name>",
+          timeoutMs: 600000,
+        },
       },
     },
   },
diff --git a/extensions/microsoft-foundry/index.test.ts b/extensions/microsoft-foundry/index.test.ts
index b7bef35a4822..44d15153420e 100644
--- a/extensions/microsoft-foundry/index.test.ts
+++ b/extensions/microsoft-foundry/index.test.ts
@@ -932,9 +932,10 @@ describe("microsoft-foundry plugin", () => {
       authMethod: "entra-id",
     });
 
-    expect(result.configPatch?.agents?.defaults?.imageGenerationModel).toEqual({
+    expect(result.configPatch?.agents?.defaults?.mediaModels?.image).toEqual({
       primary: "microsoft-foundry/mai-image-prod",
     });
+    expect(result.configPatch?.agents?.defaults).not.toHaveProperty("imageGenerationModel");
     expect(result.defaultModel).toBeUndefined();
     expect(requireFoundryProviderPatch(result).models[0]?.name).toBe("MAI-Image-2.5");
   });
@@ -986,7 +987,7 @@ describe("microsoft-foundry plugin", () => {
       modelNameHint: "MAI-Image-2.5",
       api: "openai-completions",
     });
-    expect(result.configPatch?.agents?.defaults?.imageGenerationModel).toEqual({
+    expect(result.configPatch?.agents?.defaults?.mediaModels?.image).toEqual({
       primary: "microsoft-foundry/prod-image",
     });
     expect(result.defaultModel).toBeUndefined();
@@ -1150,7 +1151,7 @@ describe("microsoft-foundry plugin", () => {
       ],
     });
 
-    expect(result.configPatch?.agents?.defaults?.imageGenerationModel).toEqual({
+    expect(result.configPatch?.agents?.defaults?.mediaModels?.image).toEqual({
       primary: "microsoft-foundry/custom-image-prod",
     });
     expect(result.defaultModel).toBeUndefined();
diff --git a/extensions/microsoft-foundry/shared.ts b/extensions/microsoft-foundry/shared.ts
index dc427aac2938..fb100efb3644 100644
--- a/extensions/microsoft-foundry/shared.ts
+++ b/extensions/microsoft-foundry/shared.ts
@@ -129,16 +129,6 @@ type FoundryConfigShape = {
   };
 };
 
-type FoundryImageDefaultPatch = {
-  agents?: {
-    defaults?: {
-      imageGenerationModel?: {
-        primary: string;
-      };
-    };
-  };
-};
-
 function normalizeFoundryModelName(value?: string | null): string | undefined {
   const trimmed = normalizeLowercaseStringOrEmpty(value);
   return trimmed || undefined;
@@ -614,15 +604,17 @@ function buildFoundryImageDefaultPatch(params: {
   modelId: string;
   modelNameHint?: string | null;
   deployments?: FoundryDeploymentConfigInput[];
-}): FoundryImageDefaultPatch {
+}) {
   if (!isSelectedMaiImageDeployment(params)) {
     return {};
   }
   return {
     agents: {
       defaults: {
-        imageGenerationModel: {
-          primary: `${PROVIDER_ID}/${params.modelId}`,
+        mediaModels: {
+          image: {
+            primary: `${PROVIDER_ID}/${params.modelId}`,
+          },
         },
       },
     },