diff --git a/scenarios/Agents/setup/standard-agent-with-threadstorage/azuredeploy.json b/scenarios/Agents/setup/standard-agent-with-threadstorage/azuredeploy.json
index b371b8d0..63b4b308 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": "15821177931885417916"
+      "templateHash": "13967412167285246353"
     }
   },
   "parameters": {
@@ -1222,7 +1222,7 @@
     {
       "type": "Microsoft.Resources/deployments",
       "apiVersion": "2022-09-01",
-      "name": "[format('ai-service-role-assignments-{0}-{1}-deployment', variables('projectName'), variables('uniqueSuffix'))]",
+      "name": "[format('ai-service-ra-{0}-{1}-deployment', variables('projectName'), variables('uniqueSuffix'))]",
       "subscriptionId": "[variables('aiServiceAccountSubscriptionId')]",
       "resourceGroup": "[variables('aiServiceAccountResourceGroupName')]",
       "properties": {
@@ -1316,7 +1316,7 @@
     {
       "type": "Microsoft.Resources/deployments",
       "apiVersion": "2022-09-01",
-      "name": "[format('ai-search-role-assignments-{0}-{1}-deployment', variables('projectName'), variables('uniqueSuffix'))]",
+      "name": "[format('ai-search-ra-{0}-{1}-deployment', variables('projectName'), variables('uniqueSuffix'))]",
       "subscriptionId": "[variables('aiSearchServiceSubscriptionId')]",
       "resourceGroup": "[variables('aiSearchServiceResourceGroupName')]",
       "properties": {
@@ -1586,8 +1586,8 @@
       "dependsOn": [
         "[resourceId('Microsoft.Resources/deployments', format('{0}-{1}-deployment', variables('name'), variables('uniqueSuffix')))]",
         "[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('aiSearchServiceSubscriptionId'), variables('aiSearchServiceResourceGroupName')), 'Microsoft.Resources/deployments', format('ai-search-ra-{0}-{1}-deployment', variables('projectName'), variables('uniqueSuffix')))]",
+        "[extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', variables('aiServiceAccountSubscriptionId'), variables('aiServiceAccountResourceGroupName')), 'Microsoft.Resources/deployments', format('ai-service-ra-{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 64a29f43..22b6ef24 100644
--- a/scenarios/Agents/setup/standard-agent-with-threadstorage/main.bicep
+++ b/scenarios/Agents/setup/standard-agent-with-threadstorage/main.bicep
@@ -195,7 +195,7 @@ module aiProject 'modules-standard/standard-ai-project.bicep' = {
 }
 
 module aiServiceRoleAssignments 'modules-standard/ai-service-role-assignments.bicep' = {
-  name: 'ai-service-role-assignments-${projectName}-${uniqueSuffix}-deployment'
+  name: 'ai-service-ra-${projectName}-${uniqueSuffix}-deployment'
   scope: resourceGroup(aiServiceAccountSubscriptionId, aiServiceAccountResourceGroupName)
   params: {
     aiServicesName: aiDependencies.outputs.aiServicesName
@@ -205,7 +205,7 @@ module aiServiceRoleAssignments 'modules-standard/ai-service-role-assignments.bi
 }
 
 module aiSearchRoleAssignments 'modules-standard/ai-search-role-assignments.bicep' = {
-  name: 'ai-search-role-assignments-${projectName}-${uniqueSuffix}-deployment'
+  name: 'ai-search-ra-${projectName}-${uniqueSuffix}-deployment'
   scope: resourceGroup(aiSearchServiceSubscriptionId, aiSearchServiceResourceGroupName)
   params: {
     aiSearchName: aiDependencies.outputs.aiSearchName