diff --git a/src/extension/agents/vscode-node/organizationAndEnterpriseAgentProvider.ts b/src/extension/agents/vscode-node/organizationAndEnterpriseAgentProvider.ts
index e13271a459..d90ddf80a3 100644
--- a/src/extension/agents/vscode-node/organizationAndEnterpriseAgentProvider.ts
+++ b/src/extension/agents/vscode-node/organizationAndEnterpriseAgentProvider.ts
@@ -389,6 +389,12 @@ export class OrganizationAndEnterpriseAgentProvider extends Disposable implement
 		if (agent.target) {
 			frontmatterObj.target = agent.target;
 		}
+		if (agent.model) {
+			frontmatterObj.model = agent.model;
+		}
+		if (agent.infer) {
+			frontmatterObj.infer = agent.infer;
+		}
 
 		const frontmatter = YAML.stringify(frontmatterObj, { lineWidth: 0 }).trim();
 		const body = agent.prompt ?? '';
diff --git a/src/extension/agents/vscode-node/test/organizationAndEnterpriseAgentProvider.spec.ts b/src/extension/agents/vscode-node/test/organizationAndEnterpriseAgentProvider.spec.ts
index 1063f3773a..cffde91f92 100644
--- a/src/extension/agents/vscode-node/test/organizationAndEnterpriseAgentProvider.spec.ts
+++ b/src/extension/agents/vscode-node/test/organizationAndEnterpriseAgentProvider.spec.ts
@@ -225,6 +225,8 @@ Test prompt content`;
 		const mockDetails: CustomAgentDetails = {
 			...mockAgent,
 			prompt: 'Detailed prompt content',
+			model: 'gpt-4',
+			infer: true,
 		};
 		mockOctoKitService.setAgentDetails('full_agent', mockDetails);
 
@@ -246,6 +248,8 @@ tools:
   - tool2
 argument-hint: Provide context
 target: vscode
+model: gpt-4
+infer: true
 ---
 Detailed prompt content
 `;
@@ -650,6 +654,8 @@ Agent 1 prompt`;
 		assert.ok(!content.includes('tools:'));
 		assert.ok(!content.includes('argument-hint:'));
 		assert.ok(!content.includes('target:'));
+		assert.ok(!content.includes('model:'));
+		assert.ok(!content.includes('infer:'));
 	});
 
 	test('excludes tools field when array contains only wildcard', async () => {
diff --git a/src/platform/github/common/githubService.ts b/src/platform/github/common/githubService.ts
index 8e30548827..51877528d1 100644
--- a/src/platform/github/common/githubService.ts
+++ b/src/platform/github/common/githubService.ts
@@ -134,6 +134,8 @@ export interface CustomAgentListItem {
 	metadata?: Record<string, string>;
 	target?: string;
 	config_error?: string;
+	model?: string;
+	infer?: boolean;
 	'mcp-servers'?: {
 		[serverName: string]: {
 			type: string;