diff --git a/src/frontend/config/sidebar/integrations.topics.ts b/src/frontend/config/sidebar/integrations.topics.ts
index 58e1c3df4..03a9a2bb4 100644
--- a/src/frontend/config/sidebar/integrations.topics.ts
+++ b/src/frontend/config/sidebar/integrations.topics.ts
@@ -346,7 +346,7 @@ export const integrationTopics: StarlightSidebarTopicsUserConfig = {
                   slug: 'integrations/cloud/azure/ai-compatibility-matrix',
                 },
                 {
-                  label: 'Azure AI Foundry',
+                  label: 'Microsoft Foundry',
                   collapsed: true,
                   items: [
                     {
diff --git a/src/frontend/src/components/IntegrationGrid.astro b/src/frontend/src/components/IntegrationGrid.astro
index 949a359a0..fc629e311 100644
--- a/src/frontend/src/components/IntegrationGrid.astro
+++ b/src/frontend/src/components/IntegrationGrid.astro
@@ -109,7 +109,7 @@ const icons = [
   },
   { meta: adminerIcon, alt: 'Adminer', search: 'adminer' },
   { meta: awsIcon, alt: 'AWS', search: 'aws', light: awsLightIcon },
-  { meta: azureAiFoundryIcon, alt: 'Azure AI Foundry', search: 'aifoundry' },
+  { meta: azureAiFoundryIcon, alt: 'Microsoft Foundry', search: 'foundry' },
   {
     meta: azureAppconfigIcon,
     alt: 'Azure App Configuration',
diff --git a/src/frontend/src/content/docs/integrations/cloud/azure/ai-compatibility-matrix.mdx b/src/frontend/src/content/docs/integrations/cloud/azure/ai-compatibility-matrix.mdx
index 02d3811c8..20622c294 100644
--- a/src/frontend/src/content/docs/integrations/cloud/azure/ai-compatibility-matrix.mdx
+++ b/src/frontend/src/content/docs/integrations/cloud/azure/ai-compatibility-matrix.mdx
@@ -13,7 +13,7 @@ The following table shows the compatibility between Aspire AI hosting and client
 
 | **Hosting Integration** | **Aspire.OpenAI** | **Aspire.Azure.AI.OpenAI** | **Aspire.Azure.AI.Inference** |
 |--|--|--|--|
-| `Aspire.Hosting.Azure.AIFoundry` | ❌ No | ⚠️ Partial | ✅ Yes (preferred) |
+| `Aspire.Hosting.Foundry` | ❌ No | ⚠️ Partial | ✅ Yes (preferred) |
 | `Aspire.Hosting.Azure.CognitiveServices` | ❌ No | ✅ Yes (preferred) | ❌ No |
 | `Aspire.Hosting.OpenAI` | ✅ Yes (preferred) | ✅ Yes | ❌ No |
 | `Aspire.Hosting.GitHub.Models` | ⚠️ Partial | ❌ No | ✅ Yes (preferred) |
@@ -31,18 +31,18 @@ The following table shows the compatibility between Aspire AI hosting and client
 
 In general, use **Aspire.Azure.AI.Inference** to connect to Azure hosted models, or **Aspire.OpenAI** to connect directly to OpenAI.
 
-### Azure AI Foundry
+### Microsoft Foundry
 
-For Azure AI Foundry resources, use the **Aspire.Azure.AI.Inference** client integration. This provides the best compatibility with the diverse range of models available through Azure AI Foundry. For more information, see [Azure AI Foundry integration](/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-get-started/).
+For Microsoft Foundry resources, use the **Aspire.Azure.AI.Inference** client integration. This provides the best compatibility with the diverse range of models available through Microsoft Foundry. For more information, see [Microsoft Foundry integration](/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-get-started/).
 
 #### Hosting integration
 
-The [Aspire.Hosting.Azure.AIFoundry](https://www.nuget.org/packages/Aspire.Hosting.Azure.AIFoundry) package provides the hosting integration. In your app host project:
+The [Aspire.Hosting.Foundry](https://www.nuget.org/packages/Aspire.Hosting.Foundry) package provides the hosting integration. In your app host project:
 
 ```csharp title="C# — AppHost.cs"
 var builder = DistributedApplication.CreateBuilder(args);
 
-var foundry = builder.AddAzureAIFoundry("foundry");
+var foundry = builder.AddFoundry("foundry");
 
 builder.AddProject<Projects.ExampleProject>()
     .WithReference(foundry);
@@ -139,15 +139,15 @@ Each hosting integration generates connection strings in different formats that
 
 ### Hosting integration connection strings
 
-#### Aspire.Hosting.Azure.AIFoundry
+#### Aspire.Hosting.Foundry
 
 **Azure:**
 
 ```
-Endpoint={Endpoint};EndpointAIInference={AIFoundryApiEndpoint}models
+Endpoint={Endpoint};EndpointAIInference={EndpointAIInference}models
 ```
 
-**Foundry local:**
+**Foundry Local:**
 
 ```
 Endpoint={EmulatorServiceUri};Key={ApiKey}
@@ -219,6 +219,6 @@ Uses `EndpointAIInference` if available, otherwise `Endpoint`.
 
 - [Azure OpenAI integration](/integrations/cloud/azure/azure-openai/azure-openai-get-started/)
 - [Azure AI Inference integration](/integrations/cloud/azure/azure-ai-inference/azure-ai-inference-get-started/)
-- [Azure AI Foundry integration](/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-get-started/)
+- [Microsoft Foundry integration](/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-get-started/)
 - [Azure AI Search integration](/integrations/cloud/azure/azure-ai-search/azure-ai-search-get-started/)
 - [Microsoft.Extensions.AI documentation](https://learn.microsoft.com/dotnet/ai/ai-extensions)
diff --git a/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-client.mdx b/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-client.mdx
index b167c6b2b..68493bcc6 100644
--- a/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-client.mdx
+++ b/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-client.mdx
@@ -1,6 +1,6 @@
 ---
-title: Azure AI Foundry client integration
-description: Learn how to use the Aspire Azure AI Foundry client integration to connect to Azure AI Foundry services.
+title: Microsoft Foundry client integration
+description: Learn how to use the Aspire Microsoft Foundry client integration to connect to Microsoft Foundry services.
 next: false
 ---
 
@@ -10,7 +10,7 @@ import aiFoundryIcon from '@assets/icons/azure-ai-foundry-icon.png';
 
 <Image
   src={aiFoundryIcon}
-  alt="Azure AI Foundry logo"
+  alt="Microsoft Foundry logo"
   height={80}
   width={80}
   class:list={'float-inline-left icon'}
@@ -19,13 +19,13 @@ import aiFoundryIcon from '@assets/icons/azure-ai-foundry-icon.png';
 
 <Badge text="🧪 Preview" variant="note" size="large" />
 
-The client integration for Azure AI Foundry is provided through the [Azure AI Inference](/integrations/cloud/azure/azure-ai-inference/azure-ai-inference-get-started/) integration.
+The client integration for Microsoft Foundry is provided through the [Azure AI Inference](/integrations/cloud/azure/azure-ai-inference/azure-ai-inference-get-started/) integration.
 
-For an introduction to working with the Azure AI Foundry client integration, see [Get started with the Azure AI Foundry integrations](/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-get-started/).
+For an introduction to working with the Microsoft Foundry client integration, see [Get started with the Microsoft Foundry integrations](/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-get-started/).
 
-## Using Azure AI Foundry from client applications
+## Using Microsoft Foundry from client applications
 
-To use Azure AI Foundry services from your client applications, you'll use the Azure AI Inference client integration. This integration provides a consistent way to interact with various AI models deployed in Azure AI Foundry, including chat completions, embeddings, and other AI capabilities.
+To use Microsoft Foundry services from your client applications, you'll use the Azure AI Inference client integration. This integration provides a consistent way to interact with various AI models deployed in Microsoft Foundry, including chat completions, embeddings, and other AI capabilities.
 
 For detailed information on how to:
 
@@ -45,7 +45,7 @@ See the complete [Azure AI Inference integration documentation](/integrations/cl
         href="/integrations/cloud/azure/azure-ai-inference/azure-ai-inference-get-started/"
     />
     <LinkCard
-        title="Azure AI Foundry Hosting integration"
+        title="Microsoft Foundry Hosting integration"
         description="Learn more about the hosting integration features and capabilities"
         href="/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-host/"
     />
diff --git a/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-get-started.mdx b/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-get-started.mdx
index b7d59b21b..91734b949 100644
--- a/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-get-started.mdx
+++ b/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-get-started.mdx
@@ -1,6 +1,6 @@
 ---
-title: Get started with the Azure AI Foundry integrations
-description: Learn how to set up the Aspire Azure AI Foundry hosting and client integrations simply.
+title: Get started with the Microsoft Foundry integrations
+description: Learn how to set up the Aspire Microsoft Foundry hosting and client integrations simply.
 prev: false
 ---
 
@@ -11,7 +11,7 @@ import aiFoundryIcon from '@assets/icons/azure-ai-foundry-icon.png';
 
 <Image
   src={aiFoundryIcon}
-  alt="Azure AI Foundry logo"
+  alt="Microsoft Foundry logo"
   height={80}
   width={80}
   class:list={'float-inline-left icon'}
@@ -20,9 +20,9 @@ import aiFoundryIcon from '@assets/icons/azure-ai-foundry-icon.png';
 
 <Badge text="🧪 Preview" variant="note" size="large" />
 
-[Azure AI Foundry](https://learn.microsoft.com/ai-studio) provides a unified platform for developing, testing, and deploying AI applications. The Aspire Azure AI Foundry integration enables you to connect to Azure AI Foundry services from your applications, providing access to various AI capabilities including model deployments, prompt flow, and more.
+[Microsoft Foundry](https://learn.microsoft.com/ai-studio) provides a unified platform for developing, testing, and deploying AI applications. The Aspire Microsoft Foundry integration enables you to connect to Microsoft Foundry services from your applications, providing access to various AI capabilities including model deployments, prompt flow, and more.
 
-In this introduction, you'll see how to install and use the Aspire Azure AI Foundry integrations in a simple configuration. If you already have this knowledge, see [Azure AI Foundry Hosting integration](/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-host/) for full reference details.
+In this introduction, you'll see how to install and use the Aspire Microsoft Foundry integrations in a simple configuration. If you already have this knowledge, see [Microsoft Foundry Hosting integration](/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-host/) for full reference details.
 
 <Aside type="note">
     To follow this guide, you must have created an Aspire solution to work with. To learn how to do that, see [Build your first Aspire app](/get-started/first-app/).
@@ -30,18 +30,18 @@ In this introduction, you'll see how to install and use the Aspire Azure AI Foun
 
 ## Set up hosting integration
 
-To begin, install the Aspire Azure AI Foundry Hosting integration in your Aspire AppHost project. This integration allows you to create and manage Azure AI Foundry resources from your Aspire hosting projects:
+To begin, install the Aspire Microsoft Foundry Hosting integration in your Aspire AppHost project. This integration allows you to create and manage Microsoft Foundry resources from your Aspire hosting projects:
 
-<InstallPackage packageName="Aspire.Hosting.Azure.AIFoundry" />
+<InstallPackage packageName="Aspire.Hosting.Foundry" />
 
-Next, in the AppHost project, create an Azure AI Foundry resource and pass it to the consuming client projects:
+Next, in the AppHost project, create a Microsoft Foundry resource and pass it to the consuming client projects:
 
 ```csharp title="C# — AppHost.cs"
 var builder = DistributedApplication.CreateBuilder(args);
 
-var foundry = builder.AddAzureAIFoundry("foundry");
+var foundry = builder.AddFoundry("foundry");
 
-var chat = foundry.AddDeployment("chat", "Phi-4", "1", "Microsoft");
+var chat = foundry.AddDeployment("chat", FoundryModel.OpenAI.Gpt5Mini);
 
 builder.AddProject<Projects.ExampleProject>()
     .WithReference(chat)
@@ -52,14 +52,14 @@ builder.AddProject<Projects.ExampleProject>()
 builder.Build().Run();
 ```
 
-The preceding code adds an Azure AI Foundry resource named `foundry` with a deployment named `chat` using the Phi-4 model to the AppHost project. The `WithReference` method passes the connection information to the `ExampleProject` project.
+The preceding code adds a Microsoft Foundry resource named `foundry` with a deployment named `chat` using the generated `FoundryModel.OpenAI.Gpt5Mini` descriptor. The `WithReference` method passes the connection information to the `ExampleProject` project.
 
 <Aside type="caution">
-  When you call `AddAzureAIFoundry`, it implicitly calls `AddAzureProvisioning`—which adds support for generating Azure resources dynamically during app startup. The app must configure the appropriate subscription and location. For more information, see [Local provisioning: Configuration](/integrations/cloud/azure/local-provisioning/#configuration).
+  When you call `AddFoundry`, it implicitly calls `AddAzureProvisioning`—which adds support for generating Azure resources dynamically during app startup. The app must configure the appropriate subscription and location. For more information, see [Local provisioning: Configuration](/integrations/cloud/azure/local-provisioning/#configuration).
 </Aside>
 
 <Aside type="tip">
-    This is the simplest implementation of Azure AI Foundry resources in the AppHost. There are many more options you can choose from to address your requirements. For full details, see [Azure AI Foundry Hosting integration](/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-host/).
+    This is the simplest implementation of Microsoft Foundry resources in the AppHost. There are many more options you can choose from to address your requirements. For full details, see [Microsoft Foundry Hosting integration](/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-host/).
 </Aside>
 
 ## Set up client integration
@@ -72,7 +72,7 @@ For more information on using the client integration, see the [Azure AI Inferenc
 
 <CardGrid>
     <LinkCard
-        title="Azure AI Foundry Hosting integration"
+        title="Microsoft Foundry Hosting integration"
         description="Learn more about the hosting integration features and capabilities"
         href="/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-host/"
     />
diff --git a/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-host.mdx b/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-host.mdx
index 36f08d7ea..e31d647d7 100644
--- a/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-host.mdx
+++ b/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-host.mdx
@@ -1,6 +1,6 @@
 ---
-title: Azure AI Foundry hosting integration
-description: Learn how to use the Aspire Azure AI Foundry hosting integration to create Azure AI Foundry resources.
+title: Microsoft Foundry hosting integration
+description: Learn how to use the Aspire Microsoft Foundry hosting integration to create Microsoft Foundry resources.
 ---
 
 import { Aside, Badge } from '@astrojs/starlight/components';
@@ -10,7 +10,7 @@ import aiFoundryIcon from '@assets/icons/azure-ai-foundry-icon.png';
 
 <Image
   src={aiFoundryIcon}
-  alt="Azure AI Foundry logo"
+  alt="Microsoft Foundry logo"
   height={80}
   width={80}
   class:list={'float-inline-left icon'}
@@ -19,42 +19,50 @@ import aiFoundryIcon from '@assets/icons/azure-ai-foundry-icon.png';
 
 <Badge text="🧪 Preview" variant="note" size="large" />
 
-The Aspire Azure AI Foundry hosting integration models the AI Foundry project as the `AzureAIFoundryResource` type. To access this type and APIs for expressing them within your AppHost project, install the [📦 Aspire.Hosting.Azure.AIFoundry](https://www.nuget.org/packages/Aspire.Hosting.Azure.AIFoundry) NuGet package:
+The Aspire Microsoft Foundry hosting integration models a Microsoft Foundry account as the `FoundryResource` type. To access this type and related APIs in your AppHost project, install the [📦 Aspire.Hosting.Foundry](https://www.nuget.org/packages/Aspire.Hosting.Foundry) NuGet package:
 
-<InstallPackage packageName="Aspire.Hosting.Azure.AIFoundry" />
+<InstallPackage packageName="Aspire.Hosting.Foundry" />
 
-For an introduction to working with the Azure AI Foundry hosting integration, see [Get started with the Azure AI Foundry integrations](/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-get-started/).
+<Aside type="note">
+  This integration was previously shipped as `Aspire.Hosting.Azure.AIFoundry`.
+  When upgrading from earlier previews, replace that package with
+  `Aspire.Hosting.Foundry`. If your code referenced package-specific Foundry
+  types such as the old `AIFoundryModel`, update those references to
+  `FoundryModel` and add `using Aspire.Hosting.Foundry;` where needed.
+</Aside>
 
-## Add an Azure AI Foundry resource
+For an introduction to working with the Microsoft Foundry hosting integration, see [Get started with the Microsoft Foundry integrations](/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-get-started/).
 
-To add an Azure AI Foundry resource to your AppHost project, call the `AddAzureAIFoundry` method providing a name:
+## Add a Microsoft Foundry resource
+
+To add a Microsoft Foundry resource to your AppHost project, call the `AddFoundry` method providing a name:
 
 ```csharp title="C# — AppHost.cs"
 var builder = DistributedApplication.CreateBuilder(args);
 
-var foundry = builder.AddAzureAIFoundry("foundry");
+var foundry = builder.AddFoundry("foundry");
 
 builder.AddProject<Projects.ExampleProject>()
-       .WithReference(foundry);
+    .WithReference(foundry);
 
 // After adding all resources, run the app...
 ```
 
-The preceding code adds an Azure AI Foundry resource named `foundry` to the AppHost project. The `WithReference` method passes the connection information to the `ExampleProject` project.
+The preceding code adds a Microsoft Foundry resource named `foundry` to the AppHost project. The `WithReference` method passes the connection information to the `ExampleProject` project.
 
 > [!IMPORTANT]
-> When you call `AddAzureAIFoundry`, it implicitly calls `AddAzureProvisioning`—which adds support for generating Azure resources dynamically during app startup. The app must configure the appropriate subscription and location. For more information, see [Local provisioning: Configuration](/integrations/cloud/azure/local-provisioning/#configuration).
+> When you call `AddFoundry`, it implicitly calls `AddAzureProvisioning`—which adds support for generating Azure resources dynamically during app startup. The app must configure the appropriate subscription and location. For more information, see [Local provisioning: Configuration](/integrations/cloud/azure/local-provisioning/#configuration).
 
-## Add an Azure AI Foundry deployment resource
+## Add a Microsoft Foundry deployment resource
 
-To add an Azure AI Foundry deployment resource, call the `AddDeployment` method:
+To add a Microsoft Foundry deployment resource, call the `AddDeployment` method with one of the generated `FoundryModel` entries:
 
 ```csharp
 var builder = DistributedApplication.CreateBuilder(args);
 
-var foundry = builder.AddAzureAIFoundry("foundry");
+var foundry = builder.AddFoundry("foundry");
 
-var chat = foundry.AddDeployment("chat", "Phi-4", "1", "Microsoft");
+var chat = foundry.AddDeployment("chat", FoundryModel.OpenAI.Gpt5Mini);
 
 builder.AddProject<Projects.ExampleProject>()
     .WithReference(chat)
@@ -65,23 +73,33 @@ builder.AddProject<Projects.ExampleProject>()
 
 The preceding code:
 
-- Adds an Azure AI Foundry resource named `foundry`.
-- Adds an Azure AI Foundry deployment resource named `chat` with a model name of `Phi-4`. The model name must correspond to an [available model](https://learn.microsoft.com/azure/ai-foundry/foundry-models/concepts/models) in the Azure AI Foundry service.
+- Adds a Microsoft Foundry resource named `foundry`.
+- Adds a Microsoft Foundry deployment resource named `chat` using the generated `FoundryModel.OpenAI.Gpt5Mini` descriptor.
+
+For more information about the generated model descriptors, see the [FoundryModel API reference](https://learn.microsoft.com/dotnet/api/aspire.hosting.foundrymodel).
+
+If you need a different generated model descriptor, use the corresponding nested type, such as `FoundryModel.Microsoft.Phi4Reasoning`:
+
+```csharp title="C# — AppHost.cs"
+var builder = DistributedApplication.CreateBuilder(args);
+
+var foundry = builder.AddFoundry("foundry");
 
-> [!NOTE]
-> The fourth parameter of the `AddDeployment(...)` method specifies the model publisher or provider. Common values include:
->
-> - `"OpenAI"` for GPT models (e.g., GPT-4o, GPT-4, GPT-3.5 Turbo)
-> - `"Microsoft"` for Phi models (e.g., Phi-4, Phi-3.5)
->
-> For more information, see the [AIFoundryModel API reference](https://learn.microsoft.com/dotnet/api/aspire.hosting.azure.aifoundrymodel).
+var chat = foundry.AddDeployment("chat", FoundryModel.Microsoft.Phi4Reasoning);
+
+builder.AddProject<Projects.ExampleProject>()
+    .WithReference(chat)
+    .WaitFor(chat);
+
+builder.Build().Run();
+```
 
 ## Configure deployment properties
 
 You can customize deployment properties using the `WithProperties` method:
 
 ```csharp
-var chat = foundry.AddDeployment("chat", "Phi-4", "1", "Microsoft")
+var chat = foundry.AddDeployment("chat", FoundryModel.OpenAI.Gpt5Mini)
     .WithProperties(deployment =>
     {
         deployment.SkuName = "Standard";
@@ -91,9 +109,95 @@ var chat = foundry.AddDeployment("chat", "Phi-4", "1", "Microsoft")
 
 The preceding code sets the SKU name to `Standard` and capacity to `10` for the deployment.
 
-## Connect to an existing Azure AI Foundry service
+## Add a Microsoft Foundry project
+
+Use the `AddProject` method to create a Microsoft Foundry project for agents, project-scoped connections, and related Azure resources:
 
-You might have an existing Azure AI Foundry service that you want to connect to. You can chain a call to annotate that your `AzureAIFoundryResource` is an existing resource:
+```csharp title="C# — AppHost.cs"
+var builder = DistributedApplication.CreateBuilder(args);
+
+var foundry = builder.AddFoundry("foundry");
+var project = foundry.AddProject("my-project");
+
+var chat = project.AddModelDeployment("chat", FoundryModel.OpenAI.Gpt5Mini);
+
+builder.AddProject<Projects.ExampleProject>("api")
+    .WithReference(project)
+    .WithReference(chat)
+    .WaitFor(chat);
+
+builder.Build().Run();
+```
+
+The preceding code creates a Foundry project and adds a deployment through `AddModelDeployment`. When you call `WithReference(project)`, Aspire injects the standard connection string and project-specific connection properties such as the project endpoint and Application Insights connection string into the consuming resource.
+
+### Configure a Foundry project
+
+You can customize the Azure resources associated with a Foundry project:
+
+```csharp title="C# — AppHost.cs"
+var builder = DistributedApplication.CreateBuilder(args);
+
+var foundry = builder.AddFoundry("foundry");
+var appInsights = builder.AddAzureApplicationInsights("appinsights");
+var keyVault = builder.AddAzureKeyVault("keyvault");
+var registry = builder.AddAzureContainerRegistry("agents");
+
+var project = foundry.AddProject("my-project")
+    .WithAppInsights(appInsights)
+    .WithKeyVault(keyVault)
+    .WithContainerRegistry(registry);
+```
+
+`AddProject` creates a default Azure Container Registry for hosted agents. Use `WithContainerRegistry` when you want to point the project at a different registry.
+
+## Publish a hosted agent to Microsoft Foundry
+
+Use `PublishAsHostedAgent` to publish an executable or containerized app as a hosted agent in a Foundry project:
+
+```csharp title="C# — AppHost.cs"
+var builder = DistributedApplication.CreateBuilder(args);
+
+var foundry = builder.AddFoundry("foundry");
+var project = foundry.AddProject("my-project");
+var chat = project.AddModelDeployment("chat", FoundryModel.OpenAI.Gpt5Mini);
+
+builder.AddPythonApp("agent", "..\\agent", "main:app")
+    .WithReference(project)
+    .WithReference(chat)
+    .PublishAsHostedAgent(project);
+
+builder.Build().Run();
+```
+
+In run mode, `PublishAsHostedAgent` configures local HTTP, liveness, and readiness endpoints and enables OpenTelemetry output for the agent. In publish mode, Aspire creates an `AzureHostedAgentResource` and publishes the container to the project-associated registry.
+
+If you omit the `project` argument, Aspire uses an existing Foundry project from the app model or creates one automatically.
+
+### Add and publish a prompt agent
+
+For prompt-only scenarios, use `AddAndPublishPromptAgent` on a Foundry project:
+
+```csharp title="C# — AppHost.cs"
+var builder = DistributedApplication.CreateBuilder(args);
+
+var foundry = builder.AddFoundry("foundry");
+var project = foundry.AddProject("my-project");
+var chat = project.AddModelDeployment("chat", FoundryModel.OpenAI.Gpt5Mini);
+
+project.AddAndPublishPromptAgent(
+    chat,
+    "support-agent",
+    instructions: "You are a helpful support assistant.");
+
+builder.Build().Run();
+```
+
+This creates an `AzurePromptAgentResource` that uses the specified model deployment in the target Foundry project.
+
+## Connect to an existing Microsoft Foundry service
+
+You might have an existing Microsoft Foundry service that you want to connect to. You can chain a call to annotate that your `FoundryResource` is an existing resource:
 
 ```csharp
 var builder = DistributedApplication.CreateBuilder(args);
@@ -101,7 +205,7 @@ var builder = DistributedApplication.CreateBuilder(args);
 var existingFoundryName = builder.AddParameter("existingFoundryName");
 var existingFoundryResourceGroup = builder.AddParameter("existingFoundryResourceGroup");
 
-var foundry = builder.AddAzureAIFoundry("foundry")
+var foundry = builder.AddFoundry("foundry")
     .AsExisting(existingFoundryName, existingFoundryResourceGroup);
 
 builder.AddProject<Projects.ExampleProject>()
@@ -120,10 +224,10 @@ Aspire supports the usage of Foundry Local for local development. Add the follow
 ```csharp title="C# — AppHost.cs"
 var builder = DistributedApplication.CreateBuilder(args);
 
-var foundry = builder.AddAzureAIFoundry("foundry")
+var foundry = builder.AddFoundry("foundry")
     .RunAsFoundryLocal();
 
-var chat = foundry.AddDeployment("chat", "phi-3.5-mini", "1", "Microsoft");
+var chat = foundry.AddDeployment("chat", FoundryModel.Local.Phi4);
 
 builder.AddProject<Projects.ExampleProject>()
     .WithReference(chat)
@@ -136,23 +240,29 @@ When the AppHost starts up, the local foundry service is also started. This requ
 
 The `RunAsFoundryLocal` method configures the resource to run as an emulator. It downloads and loads the specified models locally. The method provides health checks for the local service and automatically manages the Foundry Local lifecycle.
 
+<Aside type="caution">
+  Foundry Projects aren't supported when the parent Foundry resource uses
+  `RunAsFoundryLocal()`. Use account-level deployments for local emulator
+  scenarios.
+</Aside>
+
 ## Assign roles to resources
 
-You can assign specific roles to resources that need to access the Azure AI Foundry service. Use the `WithRoleAssignments` method:
+You can assign specific roles to resources that need to access the Microsoft Foundry service. Use the `WithRoleAssignments` method:
 
 ```csharp title="C# — AppHost.cs"
-var foundry = builder.AddAzureAIFoundry("chat");
+var foundry = builder.AddFoundry("chat");
 
 builder.AddProject<Projects.Api>("api")
   .WithRoleAssignments(foundry, CognitiveServicesBuiltInRole.CognitiveServicesUser)
   .WithReference(foundry);
 ```
 
-The preceding code assigns the `CognitiveServicesUser` role to the `api` project, granting it the necessary permissions to access the Azure AI Foundry resource.
+The preceding code assigns the `CognitiveServicesUser` role to the `api` project, granting it the necessary permissions to access the Microsoft Foundry resource.
 
 ## Provisioning-generated Bicep
 
-If you're new to [Bicep](https://learn.microsoft.com/azure/azure-resource-manager/bicep/overview), it's a domain-specific language for defining Azure resources. With Aspire, you don't need to write Bicep by-hand, instead the provisioning APIs generate Bicep for you. When you publish your app, the generated Bicep provisions an Azure AI Foundry resource with standard defaults.
+If you're new to [Bicep](https://learn.microsoft.com/azure/azure-resource-manager/bicep/overview), it's a domain-specific language for defining Azure resources. With Aspire, you don't need to write Bicep by-hand, instead the provisioning APIs generate Bicep for you. When you publish your app, the generated Bicep provisions a Microsoft Foundry resource with standard defaults.
 
 ```bicep title="Generated Bicep — ai-foundry.bicep"
 @description('The location for the resource(s) to be deployed.')
@@ -245,7 +355,7 @@ The generated Bicep is a starting point and is influenced by changes to the prov
 All Aspire Azure resources are subclasses of the `AzureProvisioningResource` type. This enables customization of the generated Bicep by providing a fluent API to configure the Azure resources—using the `ConfigureInfrastructure` API:
 
 ```csharp title="C# — AppHost.cs"
-builder.AddAzureAIFoundry("foundry")
+builder.AddFoundry("foundry")
   .ConfigureInfrastructure(infra =>
   {
       var resources = infra.GetProvisionableResources();
diff --git a/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-inference/azure-ai-inference-client.mdx b/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-inference/azure-ai-inference-client.mdx
index a908102d0..1fbdc1cfe 100644
--- a/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-inference/azure-ai-inference-client.mdx
+++ b/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-inference/azure-ai-inference-client.mdx
@@ -45,7 +45,7 @@ builder.AddAzureChatCompletionsClient(connectionName: "ai-foundry");
 ```
 
 > [!TIP]
-> The `connectionName` parameter must match the name used when adding the Azure AI Inference resource in the AppHost project. For more information, see [Connect to an existing Azure AI Foundry service](/integrations/cloud/azure/azure-ai-inference/azure-ai-inference-host/#connect-to-an-existing-azure-ai-foundry-service).
+> The `connectionName` parameter must match the name used when adding the Azure AI Inference resource in the AppHost project. For more information, see [Connect to an existing Microsoft Foundry service](/integrations/cloud/azure/azure-ai-inference/azure-ai-inference-host/#connect-to-an-existing-microsoft-foundry-service).
 
 After adding the `ChatCompletionsClient`, you can retrieve the client instance using dependency injection:
 
@@ -60,7 +60,7 @@ For more information, see:
 
 - [What is Azure AI model inference?](https://learn.microsoft.com/azure/ai-foundry/foundry-models/supported-languages?view=foundry-classic) for details on Azure AI model inference.
 - [Dependency injection in .NET](https://learn.microsoft.com/dotnet/core/extensions/dependency-injection) for details on dependency injection.
-- [The Azure AI Foundry SDK: C#](https://learn.microsoft.com/azure/ai-foundry/how-to/develop/sdk-overview?tabs=sync&pivots=programming-language-csharp).
+- [The Microsoft Foundry SDK: C#](https://learn.microsoft.com/azure/ai-foundry/how-to/develop/sdk-overview?tabs=sync&pivots=programming-language-csharp).
 
 ### Add Azure AI Inference Chat Completions client with registered `IChatClient`
 
@@ -132,7 +132,7 @@ builder.AddAzureEmbeddingsClient(connectionName: "ai-foundry");
 ```
 
 > [!TIP]
-> The `connectionName` parameter must match the name used when adding the Azure AI Inference resource in the AppHost project. For more information, see [Connect to an existing Azure AI Foundry service](/integrations/cloud/azure/azure-ai-inference/azure-ai-inference-host/#connect-to-an-existing-azure-ai-foundry-service).
+> The `connectionName` parameter must match the name used when adding the Azure AI Inference resource in the AppHost project. For more information, see [Connect to an existing Microsoft Foundry service](/integrations/cloud/azure/azure-ai-inference/azure-ai-inference-host/#connect-to-an-existing-microsoft-foundry-service).
 
 After adding the `EmbeddingsClient`, you can retrieve the client instance using dependency injection:
 
@@ -147,7 +147,7 @@ For more information, see:
 
 - [What is Azure AI model inference?](https://learn.microsoft.com/azure/ai-foundry/foundry-models/supported-languages?view=foundry-classic) for details on Azure AI model inference.
 - [Dependency injection in .NET](https://learn.microsoft.com/dotnet/core/extensions/dependency-injection) for details on dependency injection.
-- [The Azure AI Foundry SDK: C#](https://learn.microsoft.com/azure/ai-foundry/how-to/develop/sdk-overview?tabs=sync&pivots=programming-language-csharp).
+- [The Microsoft Foundry SDK: C#](https://learn.microsoft.com/azure/ai-foundry/how-to/develop/sdk-overview?tabs=sync&pivots=programming-language-csharp).
 
 ### Add Azure AI Inference Embeddings client with registered `IEmbeddingGenerator`
 
@@ -211,7 +211,7 @@ For more information, see [Keyed services in .NET](https://learn.microsoft.com/d
 
 ### Configuration
 
-The Azure AI Inference library provides multiple options to configure the Azure AI Foundry Service based on the requirements and conventions of your project.
+The Azure AI Inference library provides multiple options to configure the Microsoft Foundry Service based on the requirements and conventions of your project.
 
 > [!NOTE]
 > Either an `Endpoint` and `DeploymentId`, or a `ConnectionString` is required to be supplied.
@@ -233,7 +233,7 @@ builder.AddAzureChatCompletionsClient(
 
 The connection string is retrieved from the `ConnectionStrings` configuration section. Two connection formats are supported:
 
-##### Azure AI Foundry endpoint
+##### Microsoft Foundry endpoint
 
 The recommended approach is to use an `Endpoint`, which works with the `ChatCompletionsClientSettings.Credential` property to establish a connection. If no credential is configured, a [default credential](/integrations/cloud/azure/azure-default-credential/) is used.
 
diff --git a/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-inference/azure-ai-inference-get-started.mdx b/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-inference/azure-ai-inference-get-started.mdx
index 117d8ed61..d49f852aa 100644
--- a/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-inference/azure-ai-inference-get-started.mdx
+++ b/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-inference/azure-ai-inference-get-started.mdx
@@ -30,9 +30,9 @@ In this introduction, you'll see how to install and use the Aspire Azure AI Infe
 
 ## Set up hosting integration
 
-Although the Azure AI Inference library doesn't currently offer direct hosting integration, you can still integrate it into your AppHost project. Simply add a connection string to establish a reference to an existing Azure AI Foundry resource.
+Although the Azure AI Inference library doesn't currently offer direct hosting integration, you can still integrate it into your AppHost project. Simply add a connection string to establish a reference to an existing Microsoft Foundry resource.
 
-If you already have an [Azure AI Foundry](https://ai.azure.com/) service, you can easily connect to it by adding a connection string to your AppHost:
+If you already have a [Microsoft Foundry](https://ai.azure.com/) service, you can easily connect to it by adding a connection string to your AppHost:
 
 ```csharp title="C# — AppHost.cs"
 var builder = DistributedApplication.CreateBuilder(args);
diff --git a/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-inference/azure-ai-inference-host.mdx b/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-inference/azure-ai-inference-host.mdx
index 55a7dfc26..28c517866 100644
--- a/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-inference/azure-ai-inference-host.mdx
+++ b/src/frontend/src/content/docs/integrations/cloud/azure/azure-ai-inference/azure-ai-inference-host.mdx
@@ -18,13 +18,13 @@ import aiFoundryIcon from '@assets/icons/azure-ai-foundry-icon.png';
 
 <Badge text="🧪 Preview" variant="note" size="large" />
 
-Although the Azure AI Inference library doesn't currently offer direct hosting integration, you can still integrate it into your AppHost project. Simply add a connection string to establish a reference to an existing Azure AI Foundry resource.
+Although the Azure AI Inference library doesn't currently offer direct hosting integration, you can still integrate it into your AppHost project. Simply add a connection string to establish a reference to an existing Microsoft Foundry resource.
 
 For an introduction to working with the Azure AI Inference hosting integration, see [Get started with the Azure AI Inference integrations](/integrations/cloud/azure/azure-ai-inference/azure-ai-inference-get-started/).
 
-## Connect to an existing Azure AI Foundry service
+## Connect to an existing Microsoft Foundry service
 
-If you already have an [Azure AI Foundry](https://ai.azure.com/) service, you can easily connect to it by adding a connection string to your AppHost. This approach uses a simple, string-based configuration. To establish the connection, use the `AddConnectionString` method:
+If you already have a [Microsoft Foundry](https://ai.azure.com/) service, you can easily connect to it by adding a connection string to your AppHost. This approach uses a simple, string-based configuration. To establish the connection, use the `AddConnectionString` method:
 
 ```csharp title="C# — AppHost.cs"
 var builder = DistributedApplication.CreateBuilder(args);
diff --git a/src/frontend/src/content/docs/integrations/cloud/azure/overview.mdx b/src/frontend/src/content/docs/integrations/cloud/azure/overview.mdx
index f6db197a2..20a9e5514 100644
--- a/src/frontend/src/content/docs/integrations/cloud/azure/overview.mdx
+++ b/src/frontend/src/content/docs/integrations/cloud/azure/overview.mdx
@@ -48,7 +48,7 @@ Some Azure services can be emulated to run locally. Currently, Aspire supports t
 |--|--|
 | [Azure App Configuration](/integrations/cloud/azure/azure-app-configuration/azure-app-configuration-get-started/) | Call `RunAsEmulator` on the `IResourceBuilder<AzureAppConfigurationResource>` to configure the Azure App Configuration resource to be [emulated with the Azure App Configuration Emulator](https://learn.microsoft.com/azure/azure-app-configuration/emulator-overview). |
 | [Azure Cosmos DB](/integrations/cloud/azure/azure-cosmos-db/azure-cosmos-db-get-started/) | Call `RunAsEmulator` on the `IResourceBuilder<AzureCosmosDBResource>` to configure the Cosmos DB resource to be [emulated with the NoSQL API](https://learn.microsoft.com/azure/cosmos-db/how-to-develop-emulator). |
-| [Azure AI Foundry](/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-get-started/) | Call `RunAsFoundryLocal` on the `IResourceBuilder<AzureAIFoundryResource>` to configure the resource to be [emulated with Foundry Local](https://learn.microsoft.com/azure/ai-foundry/foundry-local/get-started). |
+| [Microsoft Foundry](/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-get-started/) | Call `RunAsFoundryLocal` on the `IResourceBuilder<FoundryResource>` to configure the resource to be [emulated with Foundry Local](https://learn.microsoft.com/azure/ai-foundry/foundry-local/get-started). |
 | [Azure Event Hubs](/integrations/cloud/azure/azure-event-hubs/azure-event-hubs-get-started/) | Call `RunAsEmulator` on the `IResourceBuilder<AzureEventHubsResource>` to configure the Event Hubs resource to be [emulated](https://learn.microsoft.com/azure/event-hubs/overview-emulator). |
 | [Azure Service Bus](/integrations/cloud/azure/azure-service-bus/azure-service-bus-get-started/) | Call `RunAsEmulator` on the `IResourceBuilder<AzureServiceBusResource>` to configure the Service Bus resource to be [emulated with Service Bus emulator](https://learn.microsoft.com/azure/service-bus-messaging/overview-emulator). |
 | [Azure SignalR Service](/integrations/cloud/azure/azure-signalr/azure-signalr-get-started/) | Call `RunAsEmulator` on the `IResourceBuilder<AzureSignalRResource>` to configure the SignalR resource to be [emulated with Azure SignalR emulator](https://learn.microsoft.com/azure/azure-signalr/signalr-howto-emulator). |
diff --git a/src/frontend/src/content/docs/whats-new/aspire-13-2.mdx b/src/frontend/src/content/docs/whats-new/aspire-13-2.mdx
index 7f58db54e..b55349716 100644
--- a/src/frontend/src/content/docs/whats-new/aspire-13-2.mdx
+++ b/src/frontend/src/content/docs/whats-new/aspire-13-2.mdx
@@ -603,25 +603,27 @@ This makes it easier to inspect your Aspire application state during debugging s
 
 ### Foundry and hosted agents
 
-Aspire 13.2 replaces the earlier AIFoundry-focused hosting surface with a broader Microsoft Foundry integration.
+Aspire 13.2 replaces the earlier AIFoundry-focused hosting surface with a broader Microsoft Foundry integration. The hosting package is now `Aspire.Hosting.Foundry`, replacing `Aspire.Hosting.Azure.AIFoundry`.
 
-You can now add Foundry resources, attach model deployments, and run against Foundry Local in development:
+You can now add Foundry accounts, create Foundry Projects, attach model deployments with the generated `FoundryModel` catalog, and publish hosted agents from the regular Aspire app model:
 
 ```csharp title="C# — AppHost.cs"
 var builder = DistributedApplication.CreateBuilder(args);
 
-var foundry = builder.AddFoundry("ai")
-    .RunAsFoundryLocal();
+var foundry = builder.AddFoundry("foundry");
+var project = foundry.AddProject("agents");
 
-var chat = foundry.AddDeployment("chat", FoundryModel.OpenAI.Gpt5Mini);
+var chat = project.AddModelDeployment("chat", FoundryModel.OpenAI.Gpt5Mini);
 
-builder.AddProject<Projects.Api>("api")
-    .WithReference(chat);
+builder.AddPythonApp("agent", "..\\agent", "main:app")
+    .WithReference(project)
+    .WithReference(chat)
+    .PublishAsHostedAgent(project);
 
 builder.Build().Run();
 ```
 
-This release also adds hosted-agent support on top of Foundry, including APIs such as `PublishAsHostedAgent` and `AddAndPublishPromptAgent`, which start to bring agent-centric deployment scenarios into the regular Aspire app model.
+New APIs in this area include `AddProject`, `AddModelDeployment`, `WithAppInsights`, `WithKeyVault`, `WithContainerRegistry`, `PublishAsHostedAgent`, and `AddAndPublishPromptAgent`. `RunAsFoundryLocal` is still available for local model development, but Foundry Projects aren't supported when the parent resource is configured as Foundry Local.
 
 ### Azure Virtual Network and private endpoint support
 
@@ -888,7 +890,16 @@ A connection property suffix has been added which may require updates to code th
 
 `Aspire.Hosting.Azure.AIFoundry` was replaced by the broader `Aspire.Hosting.Foundry` surface.
 
-If you were using the older API, migrate from `AddAzureAIFoundry()` to `AddFoundry()` and then attach one or more deployments explicitly:
+When upgrading, make both of these changes:
+
+- Replace the `Aspire.Hosting.Azure.AIFoundry` package reference with `Aspire.Hosting.Foundry`.
+- Migrate from `AddAzureAIFoundry()` to `AddFoundry()`, then add deployments explicitly with `AddDeployment()` or `AddModelDeployment()`.
+
+```xml title="XML — AppHost project file"
+<ItemGroup>
+  <PackageReference Include="Aspire.Hosting.Foundry" Version="13.2.0" />
+</ItemGroup>
+```
 
 ```csharp title="C# — Migration example"
 // Before
@@ -896,10 +907,11 @@ var ai = builder.AddAzureAIFoundry("ai");
 
 // After
 var foundry = builder.AddFoundry("ai");
-var chat = foundry.AddDeployment("chat", FoundryModel.OpenAI.Gpt5Mini);
+var project = foundry.AddProject("agents");
+var chat = project.AddModelDeployment("chat", FoundryModel.OpenAI.Gpt5Mini);
 ```
 
-This aligns the hosting API with the current Foundry branding and unlocks the new deployment and hosted-agent capabilities added in 13.2.
+This aligns the hosting API with the current Foundry branding and unlocks the new project, deployment, and hosted-agent capabilities added in 13.2.
 
 ### `WithSecretBuildArg` renamed to `WithBuildSecret`
 
@@ -931,4 +943,4 @@ Aspire Azure client integrations no longer use the parameterless `DefaultAzureCr
 
 Follow the directions in [Upgrade to Aspire 13.2](#upgrade-to-aspire-13-2) to move forward and start using the new CLI, TypeScript AppHost, dashboard, hosting, and integration capabilities in this release.
 
-For a complete list of issues addressed in this release, see the [Aspire 13.2 milestone on GitHub](https://github.com/dotnet/aspire/issues?q=is%3Aissue%20state%3Aclosed%20milestone%3A13.2).
\ No newline at end of file
+For a complete list of issues addressed in this release, see the [Aspire 13.2 milestone on GitHub](https://github.com/dotnet/aspire/issues?q=is%3Aissue%20state%3Aclosed%20milestone%3A13.2).
diff --git a/src/frontend/src/data/aspire-integration-names.json b/src/frontend/src/data/aspire-integration-names.json
index d0aca3de9..098d801bf 100644
--- a/src/frontend/src/data/aspire-integration-names.json
+++ b/src/frontend/src/data/aspire-integration-names.json
@@ -14,7 +14,7 @@
   "Aspire.Confluent.Kafka",
   "Aspire.Elastic.Clients.Elasticsearch",
   "Aspire.Hosting.AWS",
-  "Aspire.Hosting.Azure.AIFoundry",
+  "Aspire.Hosting.Foundry",
   "Aspire.Hosting.Azure.AppConfiguration",
   "Aspire.Hosting.Azure.AppContainers",
   "Aspire.Hosting.Azure.ApplicationInsights",
diff --git a/src/frontend/src/data/integration-docs.json b/src/frontend/src/data/integration-docs.json
index e0680896a..8a6fe7d1c 100644
--- a/src/frontend/src/data/integration-docs.json
+++ b/src/frontend/src/data/integration-docs.json
@@ -72,7 +72,7 @@
     "href": "/integrations/cloud/azure/overview/"
   },
   {
-    "match": "Aspire.Hosting.Azure.AIFoundry",
+    "match": "Aspire.Hosting.Foundry",
     "href": "/integrations/cloud/azure/azure-ai-foundry/azure-ai-foundry-get-started/"
   },
   {