diff --git a/scenarios/Agents/setup/network-secured-agent-thread-storage/azuredeploy.json b/scenarios/Agents/setup/network-secured-agent-thread-storage/azuredeploy.json
index 02f3ee04..2de30534 100644
--- a/scenarios/Agents/setup/network-secured-agent-thread-storage/azuredeploy.json
+++ b/scenarios/Agents/setup/network-secured-agent-thread-storage/azuredeploy.json
@@ -5,7 +5,7 @@
     "_generator": {
       "name": "bicep",
       "version": "0.33.93.31351",
-      "templateHash": "9204291102583499292"
+      "templateHash": "11033492472783042104"
     }
   },
   "parameters": {
@@ -2276,7 +2276,7 @@
     {
       "type": "Microsoft.Resources/deployments",
       "apiVersion": "2022-09-01",
-      "name": "[format('cosmos-account-role-assignments-{0}-{1}-deployment', toLower(format('{0}', parameters('defaultAiProjectName'))), parameters('uniqueSuffix'))]",
+      "name": "[format('cosmos-ac-ra-{0}-{1}-deployment', toLower(format('{0}', parameters('defaultAiProjectName'))), parameters('uniqueSuffix'))]",
       "subscriptionId": "[variables('cosmosDBSubscriptionId')]",
       "resourceGroup": "[variables('cosmosDBResourceGroupName')]",
       "properties": {
diff --git a/scenarios/Agents/setup/network-secured-agent-thread-storage/main.bicep b/scenarios/Agents/setup/network-secured-agent-thread-storage/main.bicep
index 4c396180..93de1239 100644
--- a/scenarios/Agents/setup/network-secured-agent-thread-storage/main.bicep
+++ b/scenarios/Agents/setup/network-secured-agent-thread-storage/main.bicep
@@ -336,7 +336,7 @@ module aiServiceRoleAssignments 'modules-network-secured/ai-service-role-assignm
 }
 
 module cosmosAccountRoleAssignments 'modules-network-secured/database/cosmos-account-role-assignments.bicep' = {
-  name: 'cosmos-account-role-assignments-${toLower('${defaultAiProjectName}')}-${uniqueSuffix}-deployment'
+  name: 'cosmos-ac-ra-${toLower('${defaultAiProjectName}')}-${uniqueSuffix}-deployment'
   scope: resourceGroup(cosmosDBSubscriptionId, cosmosDBResourceGroupName)
   params: {
     cosmosDBName: aiDependencies.outputs.cosmosDBName
diff --git a/scenarios/Agents/setup/standard-agent-with-threadstorage/azuredeploy.json b/scenarios/Agents/setup/standard-agent-with-threadstorage/azuredeploy.json
index ecb30760..b371b8d0 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": "11260517981500011816"
+      "templateHash": "15821177931885417916"
     }
   },
   "parameters": {
@@ -1399,7 +1399,7 @@
     {
       "type": "Microsoft.Resources/deployments",
       "apiVersion": "2022-09-01",
-      "name": "[format('cosmos-account-role-assignments-{0}-{1}-deployment', variables('projectName'), variables('uniqueSuffix'))]",
+      "name": "[format('cosmos-ac-ra-{0}-{1}-deployment', variables('projectName'), variables('uniqueSuffix'))]",
       "subscriptionId": "[variables('cosmosDBSubscriptionId')]",
       "resourceGroup": "[variables('cosmosDBResourceGroupName')]",
       "properties": {
@@ -1588,7 +1588,7 @@
         "[resourceId('Microsoft.Resources/deployments', format('{0}-{1}-deployment', variables('projectName'), variables('uniqueSuffix')))]",
         "[extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', variables('aiSearchServiceSubscriptionId'), variables('aiSearchServiceResourceGroupName')), 'Microsoft.Resources/deployments', format('ai-search-role-assignments-{0}-{1}-deployment', variables('projectName'), variables('uniqueSuffix')))]",
         "[extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', variables('aiServiceAccountSubscriptionId'), variables('aiServiceAccountResourceGroupName')), 'Microsoft.Resources/deployments', format('ai-service-role-assignments-{0}-{1}-deployment', variables('projectName'), variables('uniqueSuffix')))]",
-        "[extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', variables('cosmosDBSubscriptionId'), variables('cosmosDBResourceGroupName')), 'Microsoft.Resources/deployments', format('cosmos-account-role-assignments-{0}-{1}-deployment', variables('projectName'), variables('uniqueSuffix')))]"
+        "[extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', variables('cosmosDBSubscriptionId'), variables('cosmosDBResourceGroupName')), 'Microsoft.Resources/deployments', format('cosmos-ac-ra-{0}-{1}-deployment', variables('projectName'), variables('uniqueSuffix')))]"
       ]
     },
     {
diff --git a/scenarios/Agents/setup/standard-agent-with-threadstorage/main.bicep b/scenarios/Agents/setup/standard-agent-with-threadstorage/main.bicep
index 1593d023..64a29f43 100644
--- a/scenarios/Agents/setup/standard-agent-with-threadstorage/main.bicep
+++ b/scenarios/Agents/setup/standard-agent-with-threadstorage/main.bicep
@@ -215,7 +215,7 @@ module aiSearchRoleAssignments 'modules-standard/ai-search-role-assignments.bice
 }
 
 module cosmosAccountRoleAssignments 'modules-standard/cosmos-account-role-assignments.bicep' = {
-  name: 'cosmos-account-role-assignments-${projectName}-${uniqueSuffix}-deployment'
+  name: 'cosmos-ac-ra-${projectName}-${uniqueSuffix}-deployment'
   scope: resourceGroup(cosmosDBSubscriptionId, cosmosDBResourceGroupName)
   params: {
     cosmosDBName: aiDependencies.outputs.cosmosDBName