diff --git a/scenarios/Agents/setup/standard-agent-with-threadstorage/azuredeploy.json b/scenarios/Agents/setup/standard-agent-with-threadstorage/azuredeploy.json
index e1dbf88e..19f831c9 100644
--- a/scenarios/Agents/setup/standard-agent-with-threadstorage/azuredeploy.json
+++ b/scenarios/Agents/setup/standard-agent-with-threadstorage/azuredeploy.json
@@ -5,7 +5,7 @@
     "_generator": {
       "name": "bicep",
       "version": "0.33.93.31351",
-      "templateHash": "8527508992869683277"
+      "templateHash": "15951707972022123305"
     }
   },
   "parameters": {
@@ -1087,7 +1087,7 @@
             "_generator": {
               "name": "bicep",
               "version": "0.33.93.31351",
-              "templateHash": "2930065960155969856"
+              "templateHash": "17785875270341448315"
             }
           },
           "parameters": {
@@ -1176,7 +1176,7 @@
               "name": "[format('{0}/{1}', parameters('aiProjectName'), variables('cosmosConnectionName'))]",
               "properties": {
                 "category": "CosmosDB",
-                "target": "[format('https://{0}documents.azure.com:443/', parameters('cosmosDBName'))]",
+                "target": "[format('https://{0}.documents.azure.com:443/', parameters('cosmosDBName'))]",
                 "authType": "AAD",
                 "metadata": {
                   "ApiType": "Azure",
diff --git a/scenarios/Agents/setup/standard-agent-with-threadstorage/modules-standard/standard-ai-hub.bicep b/scenarios/Agents/setup/standard-agent-with-threadstorage/modules-standard/standard-ai-hub.bicep
index 3286bbbf..5d0fd962 100644
--- a/scenarios/Agents/setup/standard-agent-with-threadstorage/modules-standard/standard-ai-hub.bicep
+++ b/scenarios/Agents/setup/standard-agent-with-threadstorage/modules-standard/standard-ai-hub.bicep
@@ -51,8 +51,10 @@ param aiSearchServiceSubscriptionId string
 @description('AI Service Account kind: either OpenAI or AIServices')
 param aiServiceKind string 
 
+@description('Connection name of the AI Search resource')
 var acsConnectionName = '${aiHubName}-connection-AISearch'
 
+@description('Name of aoai connection')
 var aoaiConnection  = '${aiHubName}-connection-AIServices_aoai'
 
 var kindAIServicesExists = aiServiceKind == 'AIServices'
@@ -69,6 +71,7 @@ resource searchService 'Microsoft.Search/searchServices@2024-06-01-preview' exis
   scope: resourceGroup(aiSearchServiceSubscriptionId, aiSearchServiceResourceGroupName)
 }
 
+#disable-next-line BCP081
 resource aiHub 'Microsoft.MachineLearningServices/workspaces@2024-10-01-preview' = {
   name: aiHubName
   location: location
diff --git a/scenarios/Agents/setup/standard-agent-with-threadstorage/modules-standard/standard-ai-project.bicep b/scenarios/Agents/setup/standard-agent-with-threadstorage/modules-standard/standard-ai-project.bicep
index 7a4446dc..3ac73d30 100644
--- a/scenarios/Agents/setup/standard-agent-with-threadstorage/modules-standard/standard-ai-project.bicep
+++ b/scenarios/Agents/setup/standard-agent-with-threadstorage/modules-standard/standard-ai-project.bicep
@@ -33,6 +33,7 @@ var resourceGroupName = resourceGroup().name
 
 var projectConnectionString = '${location}.api.azureml.ms;${subscriptionId};${resourceGroupName};${aiProjectName}'
 
+@description('Connection name for the CosmosDB resource')
 var cosmosConnectionName = '${aiProjectName}-connection-CosmosDBAccount'
 
 resource cosmosDBAccount 'Microsoft.DocumentDB/databaseAccounts@2024-12-01-preview' existing = {
@@ -68,7 +69,7 @@ resource project_connection_cosmosdb 'Microsoft.MachineLearningServices/workspac
   parent: aiProject
   properties: {
     category: 'CosmosDB'
-    target: 'https://${cosmosDBName}documents.azure.com:443/'
+    target: 'https://${cosmosDBName}.documents.azure.com:443/'
     authType: 'AAD'
     metadata: {
       ApiType: 'Azure'
diff --git a/scenarios/Agents/setup/standard-agent-with-threadstorage/modules-standard/validate-existing-resources.bicep b/scenarios/Agents/setup/standard-agent-with-threadstorage/modules-standard/validate-existing-resources.bicep
index 5c4a8d1a..1dda670f 100644
--- a/scenarios/Agents/setup/standard-agent-with-threadstorage/modules-standard/validate-existing-resources.bicep
+++ b/scenarios/Agents/setup/standard-agent-with-threadstorage/modules-standard/validate-existing-resources.bicep
@@ -32,7 +32,7 @@ var storageParts = split(aiStorageAccountResourceId, '/')
 var azureStorageSubscriptionId = storagePassedIn ? storageParts[2] : subscription().subscriptionId
 var azureStorageResourceGroupName = storagePassedIn ? storageParts[4] : resourceGroup().name
 
-resource aiServiceAccount 'Microsoft.CognitiveServices/accounts@2023-10-01-preview' existing = if (aiServicesPassedIn) {
+resource aiServiceAccount 'Microsoft.CognitiveServices/accounts@2024-10-01' existing = if (aiServicesPassedIn) {
   name: last(split(aiServiceAccountResourceId, '/'))
   scope: resourceGroup(aiServiceAccountSubscriptionId, aiServiceAccountResourceGroupName)
 }