diff --git a/helpers/GenerateResourcesAndImage.ps1 b/helpers/GenerateResourcesAndImage.ps1
index d023e1039..36515dcd5 100644
--- a/helpers/GenerateResourcesAndImage.ps1
+++ b/helpers/GenerateResourcesAndImage.ps1
@@ -192,6 +192,12 @@ Function GenerateResourcesAndImage {
     # Resource group names may contain special characters, that are not allowed in the storage account name
     $storageAccountName = $storageAccountName.Replace("-", "").Replace("_", "").Replace("(", "").Replace(")", "").ToLower()
     $storageAccountName += "001"
+    
+    
+    # Storage Account Name can only be 24 characters long
+    if ($storageAccountName.Length -gt 24){
+        $storageAccountName = $storageAccountName.Substring(0, 24)
+    }
 
     New-AzStorageAccount -ResourceGroupName $ResourceGroupName -AccountName $storageAccountName -Location $AzureLocation -SkuName "Standard_LRS" -AllowBlobPublicAccess $AllowBlobPublicAccess -EnableHttpsTrafficOnly $EnableHttpsTrafficOnly
 
@@ -268,4 +274,4 @@ Function GenerateResourcesAndImage {
         -var "install_password=$($InstallPassword)" `
         -var "allowed_inbound_ip_addresses=$($AgentIp)" `
         $builderScriptPath
-}
\ No newline at end of file
+}