diff --git a/samples/microsoft/infrastructure-setup/15-private-network-standard-agent-setup/main.bicep b/samples/microsoft/infrastructure-setup/15-private-network-standard-agent-setup/main.bicep
index a08b9bbf..0b242fcb 100644
--- a/samples/microsoft/infrastructure-setup/15-private-network-standard-agent-setup/main.bicep
+++ b/samples/microsoft/infrastructure-setup/15-private-network-standard-agent-setup/main.bicep
@@ -82,7 +82,8 @@ param azureCosmosDBAccountResourceId string = ''
 var projectName = toLower('${firstProjectName}${uniqueSuffix}')
 var cosmosDBName = toLower('${aiServices}${uniqueSuffix}cosmosdb')
 var aiSearchName = toLower('${aiServices}${uniqueSuffix}search')
-var azureStorageName = toLower('${aiServices}${uniqueSuffix}storage')
+//storage account name can only be 24 characters and must not contain special characters
+var azureStorageName = take(replace(replace(toLower('${aiServices}${uniqueSuffix}storage'), '-', ''), '_', ''), 24)
 
 // Check if existing resources have been passed in
 var storagePassedIn = azureStorageAccountResourceId != ''