diff --git a/infra/main.bicep b/infra/main.bicep
index 33bf049f..e6d4b55a 100644
--- a/infra/main.bicep
+++ b/infra/main.bicep
@@ -5,7 +5,9 @@ metadata name = 'Content Processing Solution Accelerator'
 metadata description = 'Bicep template to deploy the Content Processing Solution Accelerator with AVM compliance.'
 
 // ========== Parameters ========== //
-@description('Required. Name of the solution to deploy.')
+@minLength(3)
+@maxLength(20)
+@description('Required. Name of the solution to deploy. This should be 3-20 characters long:')
 param solutionName string = 'cps'
 @description('Optional. Location for all Resources.')
 param location string = resourceGroup().location
diff --git a/infra/main.json b/infra/main.json
index e8202bd8..1fd836ac 100644
--- a/infra/main.json
+++ b/infra/main.json
@@ -6,7 +6,7 @@
     "_generator": {
       "name": "bicep",
       "version": "0.37.4.10188",
-      "templateHash": "14310770063360835011"
+      "templateHash": "11985360537269850534"
     },
     "name": "Content Processing Solution Accelerator",
     "description": "Bicep template to deploy the Content Processing Solution Accelerator with AVM compliance."
@@ -15,8 +15,10 @@
     "solutionName": {
       "type": "string",
       "defaultValue": "cps",
+      "minLength": 3,
+      "maxLength": 20,
       "metadata": {
-        "description": "Required. Name of the solution to deploy."
+        "description": "Required. Name of the solution to deploy. This should be 3-20 characters long:"
       }
     },
     "location": {
@@ -32964,8 +32966,8 @@
         "avmContainerApp",
         "avmContainerApp_API",
         "avmManagedIdentity",
-        "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageBlob)]",
         "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageQueue)]",
+        "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageBlob)]",
         "virtualNetwork"
       ]
     },
@@ -38706,10 +38708,10 @@
       "dependsOn": [
         "avmContainerApp",
         "avmManagedIdentity",
-        "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').aiServices)]",
         "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').contentUnderstanding)]",
         "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').openAI)]",
         "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)]",
+        "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').aiServices)]",
         "logAnalyticsWorkspace",
         "virtualNetwork"
       ]
@@ -41049,6 +41051,7 @@
         "avmManagedIdentity",
         "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').contentUnderstanding)]",
         "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)]",
+        "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)]",
         "virtualNetwork"
       ]
     },