diff --git a/specification/cognitiveservices/resource-manager/Microsoft.CognitiveServices/preview/2025-10-01-preview/cognitiveservices.json b/specification/cognitiveservices/resource-manager/Microsoft.CognitiveServices/preview/2025-10-01-preview/cognitiveservices.json
index d734d54733ad..578dbd282f95 100644
--- a/specification/cognitiveservices/resource-manager/Microsoft.CognitiveServices/preview/2025-10-01-preview/cognitiveservices.json
+++ b/specification/cognitiveservices/resource-manager/Microsoft.CognitiveServices/preview/2025-10-01-preview/cognitiveservices.json
@@ -7080,7 +7080,7 @@
         }
       }
     },
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.CognitiveServices/accounts/{accountName}/projects/{projectName}/applications/{appName}/deployments": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.CognitiveServices/accounts/{accountName}/projects/{projectName}/applications/{appName}/agentDeployments": {
       "get": {
         "tags": [
           "AgentDeployment"
@@ -7171,7 +7171,7 @@
         }
       }
     },
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.CognitiveServices/accounts/{accountName}/projects/{projectName}/applications/{appName}/deployments/{deploymentName}": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.CognitiveServices/accounts/{accountName}/projects/{projectName}/applications/{appName}/agentDeployments/{deploymentName}": {
       "delete": {
         "tags": [
           "AgentDeployment"
@@ -7374,7 +7374,7 @@
         "x-ms-long-running-operation": true
       }
     },
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.CognitiveServices/accounts/{accountName}/projects/{projectName}/applications/{appName}/deployments/{deploymentName}/start": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.CognitiveServices/accounts/{accountName}/projects/{projectName}/applications/{appName}/agentDeployments/{deploymentName}/start": {
       "post": {
         "tags": [
           "AgentDeployment"
@@ -7425,7 +7425,7 @@
         }
       }
     },
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.CognitiveServices/accounts/{accountName}/projects/{projectName}/applications/{appName}/deployments/{deploymentName}/stop": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.CognitiveServices/accounts/{accountName}/projects/{projectName}/applications/{appName}/agentDeployments/{deploymentName}/stop": {
       "post": {
         "tags": [
           "AgentDeployment"
@@ -11906,6 +11906,10 @@
             "type": "string"
           },
           "x-nullable": true
+        },
+        "enablePublicHostingEnvironment": {
+          "type": "boolean",
+          "description": "Whether public hosting environment is enabled for the capability host"
         }
       },
       "x-ms-client-name": "CapabilityHostProperties",
diff --git a/specification/cognitiveservices/resource-manager/Microsoft.CognitiveServices/preview/2025-10-01-preview/examples/AccountCapabilityHost/createOrUpdate.json b/specification/cognitiveservices/resource-manager/Microsoft.CognitiveServices/preview/2025-10-01-preview/examples/AccountCapabilityHost/createOrUpdate.json
index 5883862d3f50..7724b3476aff 100644
--- a/specification/cognitiveservices/resource-manager/Microsoft.CognitiveServices/preview/2025-10-01-preview/examples/AccountCapabilityHost/createOrUpdate.json
+++ b/specification/cognitiveservices/resource-manager/Microsoft.CognitiveServices/preview/2025-10-01-preview/examples/AccountCapabilityHost/createOrUpdate.json
@@ -7,7 +7,8 @@
     "api-version": "2025-10-01-preview",
     "capabilityHost": {
       "properties": {
-        "customerSubnet": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/myResourceGroups/providers/Microsoft.Network/virtualNetworks/myVnet/subnets/mySubnet"
+        "customerSubnet": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/myResourceGroups/providers/Microsoft.Network/virtualNetworks/myVnet/subnets/mySubnet",
+        "enablePublicHostingEnvironment": true
       }
     }
   },
@@ -24,7 +25,8 @@
             "string": "string"
           },
           "customerSubnet": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/myResourceGroups/providers/Microsoft.Network/virtualNetworks/myVnet/subnets/mySubne",
-          "provisioningState": "Succeeded"
+          "provisioningState": "Succeeded",
+          "enablePublicHostingEnvironment": true
         }
       }
     },
@@ -42,7 +44,8 @@
             "string": "string"
           },
           "customerSubnet": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/myResourceGroups/providers/Microsoft.Network/virtualNetworks/myVnet/subnets/mySubne",
-          "provisioningState": "Succeeded"
+          "provisioningState": "Succeeded",
+          "enablePublicHostingEnvironment": true
         }
       }
     }
diff --git a/specification/cognitiveservices/resource-manager/Microsoft.CognitiveServices/preview/2025-10-01-preview/examples/AccountCapabilityHost/get.json b/specification/cognitiveservices/resource-manager/Microsoft.CognitiveServices/preview/2025-10-01-preview/examples/AccountCapabilityHost/get.json
index a367cd7eb277..b27cc4ac4bf3 100644
--- a/specification/cognitiveservices/resource-manager/Microsoft.CognitiveServices/preview/2025-10-01-preview/examples/AccountCapabilityHost/get.json
+++ b/specification/cognitiveservices/resource-manager/Microsoft.CognitiveServices/preview/2025-10-01-preview/examples/AccountCapabilityHost/get.json
@@ -19,7 +19,8 @@
             "string": "string"
           },
           "customerSubnet": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/myResourceGroups/providers/Microsoft.Network/virtualNetworks/myVnet/subnets/mySubne",
-          "provisioningState": "Succeeded"
+          "provisioningState": "Succeeded",
+          "enablePublicHostingEnvironment": true
         }
       }
     }
diff --git a/specification/cognitiveservices/resource-manager/Microsoft.CognitiveServices/preview/2025-10-01-preview/examples/AgentApplication/listDeployments.json b/specification/cognitiveservices/resource-manager/Microsoft.CognitiveServices/preview/2025-10-01-preview/examples/AgentApplication/listDeployments.json
index 50d460b88f67..cf09af095a36 100644
--- a/specification/cognitiveservices/resource-manager/Microsoft.CognitiveServices/preview/2025-10-01-preview/examples/AgentApplication/listDeployments.json
+++ b/specification/cognitiveservices/resource-manager/Microsoft.CognitiveServices/preview/2025-10-01-preview/examples/AgentApplication/listDeployments.json
@@ -13,9 +13,9 @@
       "body": {
         "value": [
           {
-            "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/test-rg/providers/Microsoft.CognitiveServices/accounts/my-cognitive-services-account/projects/my-project/applications/agent-app-1/deployments/deploy-001",
+            "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/test-rg/providers/Microsoft.CognitiveServices/accounts/my-cognitive-services-account/projects/my-project/applications/agent-app-1/agentDeployments/deploy-001",
             "name": "deploy-001",
-            "type": "Microsoft.CognitiveServices/accounts/projects/applications/deployments",
+            "type": "Microsoft.CognitiveServices/accounts/projects/applications/agentDeployments",
             "properties": {
               "displayName": "Production deployment for customer support agents",
               "deploymentId": "550e8400-e29b-41d4-a716-446655440001",
@@ -46,9 +46,9 @@
             }
           },
           {
-            "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/test-rg/providers/Microsoft.CognitiveServices/accounts/my-cognitive-services-account/projects/my-project/applications/agent-app-1/deployments/deploy-002",
+            "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/test-rg/providers/Microsoft.CognitiveServices/accounts/my-cognitive-services-account/projects/my-project/applications/agent-app-1/agentDeployments/deploy-002",
             "name": "deploy-002",
-            "type": "Microsoft.CognitiveServices/accounts/projects/applications/deployments",
+            "type": "Microsoft.CognitiveServices/accounts/projects/applications/agentDeployments",
             "properties": {
               "displayName": "Staging deployment for testing new features",
               "deploymentId": "550e8400-e29b-41d4-a716-446655440002",
diff --git a/specification/cognitiveservices/resource-manager/Microsoft.CognitiveServices/preview/2025-10-01-preview/examples/AgentDeployment/createOrUpdate.json b/specification/cognitiveservices/resource-manager/Microsoft.CognitiveServices/preview/2025-10-01-preview/examples/AgentDeployment/createOrUpdate.json
index 0b712cd8c5da..fffc1b49210c 100644
--- a/specification/cognitiveservices/resource-manager/Microsoft.CognitiveServices/preview/2025-10-01-preview/examples/AgentDeployment/createOrUpdate.json
+++ b/specification/cognitiveservices/resource-manager/Microsoft.CognitiveServices/preview/2025-10-01-preview/examples/AgentDeployment/createOrUpdate.json
@@ -32,9 +32,9 @@
     "200": {
       "headers": {},
       "body": {
-        "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/test-rg/providers/Microsoft.CognitiveServices/accounts/my-cognitive-services-account/projects/my-project/applications/agent-app-1/deployments/deployment-1",
+        "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/test-rg/providers/Microsoft.CognitiveServices/accounts/my-cognitive-services-account/projects/my-project/applications/agent-app-1/agentDeployments/deployment-1",
         "name": "deployment-1",
-        "type": "Microsoft.CognitiveServices/accounts/projects/applications/deployments",
+        "type": "Microsoft.CognitiveServices/accounts/projects/applications/agentDeployments",
         "properties": {
           "displayName": "Production Deployment",
           "deploymentId": "550e8400-e29b-41d4-a716-446655440001",
@@ -70,9 +70,9 @@
         "Azure-AsyncOperation": "https://management.azure.com/subscriptions/00000000-1111-2222-3333-444444444444/providers/Microsoft.CognitiveServices/locations/westus/operationresults/00000000-1111-2222-3333-444444444444?api-version=2025-10-01-preview"
       },
       "body": {
-        "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/test-rg/providers/Microsoft.CognitiveServices/accounts/my-cognitive-services-account/projects/my-project/applications/agent-app-1/deployments/deployment-1",
+        "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/test-rg/providers/Microsoft.CognitiveServices/accounts/my-cognitive-services-account/projects/my-project/applications/agent-app-1/agentDeployments/deployment-1",
         "name": "deployment-1",
-        "type": "Microsoft.CognitiveServices/accounts/projects/applications/deployments",
+        "type": "Microsoft.CognitiveServices/accounts/projects/applications/agentDeployments",
         "properties": {
           "displayName": "Production Deployment",
           "deploymentId": "550e8400-e29b-41d4-a716-446655440001",
diff --git a/specification/cognitiveservices/resource-manager/Microsoft.CognitiveServices/preview/2025-10-01-preview/examples/AgentDeployment/get.json b/specification/cognitiveservices/resource-manager/Microsoft.CognitiveServices/preview/2025-10-01-preview/examples/AgentDeployment/get.json
index f2dd0fa74fed..76f644dc1210 100644
--- a/specification/cognitiveservices/resource-manager/Microsoft.CognitiveServices/preview/2025-10-01-preview/examples/AgentDeployment/get.json
+++ b/specification/cognitiveservices/resource-manager/Microsoft.CognitiveServices/preview/2025-10-01-preview/examples/AgentDeployment/get.json
@@ -12,9 +12,9 @@
     "200": {
       "headers": {},
       "body": {
-        "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/test-rg/providers/Microsoft.CognitiveServices/accounts/my-cognitive-services-account/projects/my-project/applications/agent-app-1/deployments/deployment-1",
+        "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/test-rg/providers/Microsoft.CognitiveServices/accounts/my-cognitive-services-account/projects/my-project/applications/agent-app-1/agentDeployments/deployment-1",
         "name": "deployment-1",
-        "type": "Microsoft.CognitiveServices/accounts/projects/applications/deployments",
+        "type": "Microsoft.CognitiveServices/accounts/projects/applications/agentDeployments",
         "properties": {
           "displayName": "Production Deployment",
           "deploymentId": "550e8400-e29b-41d4-a716-446655440001",
diff --git a/specification/cognitiveservices/resource-manager/Microsoft.CognitiveServices/preview/2025-10-01-preview/examples/AgentDeployment/list.json b/specification/cognitiveservices/resource-manager/Microsoft.CognitiveServices/preview/2025-10-01-preview/examples/AgentDeployment/list.json
index a408dfcd4360..01190968c067 100644
--- a/specification/cognitiveservices/resource-manager/Microsoft.CognitiveServices/preview/2025-10-01-preview/examples/AgentDeployment/list.json
+++ b/specification/cognitiveservices/resource-manager/Microsoft.CognitiveServices/preview/2025-10-01-preview/examples/AgentDeployment/list.json
@@ -13,9 +13,9 @@
       "body": {
         "value": [
           {
-            "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/test-rg/providers/Microsoft.CognitiveServices/accounts/my-cognitive-services-account/projects/my-project/applications/agent-app-1/deployments/deployment-1",
+            "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/test-rg/providers/Microsoft.CognitiveServices/accounts/my-cognitive-services-account/projects/my-project/applications/agent-app-1/agentDeployments/deployment-1",
             "name": "deployment-1",
-            "type": "Microsoft.CognitiveServices/accounts/projects/applications/deployments",
+            "type": "Microsoft.CognitiveServices/accounts/projects/applications/agentDeployments",
             "properties": {
               "displayName": "Production Deployment",
               "deploymentId": "550e8400-e29b-41d4-a716-446655440001",
diff --git a/specification/cognitiveservices/resource-manager/readme.md b/specification/cognitiveservices/resource-manager/readme.md
index d33d74abf222..99fc7de332d7 100644
--- a/specification/cognitiveservices/resource-manager/readme.md
+++ b/specification/cognitiveservices/resource-manager/readme.md
@@ -50,9 +50,9 @@ suppressions:
   - code:  ProvisioningStateMustBeReadOnly
     reason: Schema ref is AgentDeploymentResource -> AgentDeployment. AgentDeployment has a readonly provisioning state.
     where:
-      - $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.CognitiveServices/accounts/{accountName}/projects/{projectName}/applications/{appName}/deployments/{deploymentName}"].get.responses.200.schema
-      - $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.CognitiveServices/accounts/{accountName}/projects/{projectName}/applications/{appName}/deployments/{deploymentName}"].put.responses.200.schema
-      - $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.CognitiveServices/accounts/{accountName}/projects/{projectName}/applications/{appName}/deployments/{deploymentName}"].put.responses.201.schema
+      - $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.CognitiveServices/accounts/{accountName}/projects/{projectName}/applications/{appName}/agentDeployments/{deploymentName}"].get.responses.200.schema
+      - $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.CognitiveServices/accounts/{accountName}/projects/{projectName}/applications/{appName}/agentDeployments/{deploymentName}"].put.responses.200.schema
+      - $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.CognitiveServices/accounts/{accountName}/projects/{projectName}/applications/{appName}/agentDeployments/{deploymentName}"].put.responses.201.schema
   - code: ArmResourcePropertiesBag
     reason: This API is copied from Machine Learning Services RP where this behavior is already established.
     where: