diff --git a/avm/res/sql/server/README.md b/avm/res/sql/server/README.md
index 7a171c098a..8be4e4521d 100644
--- a/avm/res/sql/server/README.md
+++ b/avm/res/sql/server/README.md
@@ -64,7 +64,7 @@ module server 'br/public:avm/res/sql/server:<version>' = {
   name: 'serverDeployment'
   params: {
     // Required parameters
-    name: 'sqlsadmin'
+    name: 'sqladmin'
     // Non-required parameters
     administrators: {
       azureADOnlyAuthentication: true
@@ -91,7 +91,7 @@ module server 'br/public:avm/res/sql/server:<version>' = {
   "parameters": {
     // Required parameters
     "name": {
-      "value": "sqlsadmin"
+      "value": "sqladmin"
     },
     // Non-required parameters
     "administrators": {
@@ -369,7 +369,12 @@ module server 'br/public:avm/res/sql/server:<version>' = {
     ]
     securityAlertPolicies: [
       {
+        disabledAlerts: []
         emailAccountAdmins: true
+        emailAddresses: [
+          'test1@contoso.com'
+          'test2@contoso.com'
+        ]
         name: 'Default'
         state: 'Enabled'
       }
@@ -551,7 +556,12 @@ module server 'br/public:avm/res/sql/server:<version>' = {
     "securityAlertPolicies": {
       "value": [
         {
+          "disabledAlerts": [],
           "emailAccountAdmins": true,
+          "emailAddresses": [
+            "test1@contoso.com",
+            "test2@contoso.com"
+          ],
           "name": "Default",
           "state": "Enabled"
         }
@@ -606,7 +616,7 @@ module server 'br/public:avm/res/sql/server:<version>' = {
   name: 'serverDeployment'
   params: {
     // Required parameters
-    name: 'sqlsec-sec'
+    name: 'sqlsc-sec'
     // Non-required parameters
     administratorLogin: 'adminUserName'
     administratorLoginPassword: '<administratorLoginPassword>'
@@ -644,7 +654,7 @@ module server 'br/public:avm/res/sql/server:<version>' = {
   "parameters": {
     // Required parameters
     "name": {
-      "value": "sqlsec-sec"
+      "value": "sqlsc-sec"
     },
     // Non-required parameters
     "administratorLogin": {
@@ -696,7 +706,7 @@ module server 'br/public:avm/res/sql/server:<version>' = {
   name: 'serverDeployment'
   params: {
     // Required parameters
-    name: 'sqlsvln'
+    name: 'sqlvln'
     // Non-required parameters
     administratorLogin: 'adminUserName'
     administratorLoginPassword: '<administratorLoginPassword>'
@@ -710,7 +720,12 @@ module server 'br/public:avm/res/sql/server:<version>' = {
     primaryUserAssignedIdentityId: '<primaryUserAssignedIdentityId>'
     securityAlertPolicies: [
       {
+        disabledAlerts: []
         emailAccountAdmins: true
+        emailAddresses: [
+          'test1@contoso.com'
+          'test2@contoso.com'
+        ]
         name: 'Default'
         state: 'Enabled'
       }
@@ -750,7 +765,7 @@ module server 'br/public:avm/res/sql/server:<version>' = {
   "parameters": {
     // Required parameters
     "name": {
-      "value": "sqlsvln"
+      "value": "sqlvln"
     },
     // Non-required parameters
     "administratorLogin": {
@@ -776,7 +791,12 @@ module server 'br/public:avm/res/sql/server:<version>' = {
     "securityAlertPolicies": {
       "value": [
         {
+          "disabledAlerts": [],
           "emailAccountAdmins": true,
+          "emailAddresses": [
+            "test1@contoso.com",
+            "test2@contoso.com"
+          ],
           "name": "Default",
           "state": "Enabled"
         }
@@ -904,7 +924,12 @@ module server 'br/public:avm/res/sql/server:<version>' = {
     restrictOutboundNetworkAccess: 'Disabled'
     securityAlertPolicies: [
       {
+        disabledAlerts: []
         emailAccountAdmins: true
+        emailAddresses: [
+          'test1@contoso.com'
+          'test2@contoso.com'
+        ]
         name: 'Default'
         state: 'Enabled'
       }
@@ -1047,7 +1072,12 @@ module server 'br/public:avm/res/sql/server:<version>' = {
     "securityAlertPolicies": {
       "value": [
         {
+          "disabledAlerts": [],
           "emailAccountAdmins": true,
+          "emailAddresses": [
+            "test1@contoso.com",
+            "test2@contoso.com"
+          ],
           "name": "Default",
           "state": "Enabled"
         }
diff --git a/avm/res/sql/server/database/main.bicep b/avm/res/sql/server/database/main.bicep
index ff985b8eb6..66d3d56487 100644
--- a/avm/res/sql/server/database/main.bicep
+++ b/avm/res/sql/server/database/main.bicep
@@ -211,12 +211,8 @@ module database_backupShortTermRetentionPolicy 'backup-short-term-retention-poli
   params: {
     serverName: serverName
     databaseName: database.name
-    diffBackupIntervalInHours: contains(backupShortTermRetentionPolicy, 'diffBackupIntervalInHours')
-      ? backupShortTermRetentionPolicy.diffBackupIntervalInHours
-      : 24
-    retentionDays: contains(backupShortTermRetentionPolicy, 'retentionDays')
-      ? backupShortTermRetentionPolicy.retentionDays
-      : 7
+    diffBackupIntervalInHours: backupShortTermRetentionPolicy.?backupShortTermRetentionPolicy.diffBackupIntervalInHours ?? 24
+    retentionDays: backupShortTermRetentionPolicy.?backupShortTermRetentionPolicy.retentionDays ?? 7
   }
 }
 
@@ -225,16 +221,10 @@ module database_backupLongTermRetentionPolicy 'backup-long-term-retention-policy
   params: {
     serverName: serverName
     databaseName: database.name
-    weeklyRetention: contains(backupLongTermRetentionPolicy, 'weeklyRetention')
-      ? backupLongTermRetentionPolicy.weeklyRetention
-      : ''
-    monthlyRetention: contains(backupLongTermRetentionPolicy, 'monthlyRetention')
-      ? backupLongTermRetentionPolicy.monthlyRetention
-      : ''
-    yearlyRetention: contains(backupLongTermRetentionPolicy, 'yearlyRetention')
-      ? backupLongTermRetentionPolicy.yearlyRetention
-      : ''
-    weekOfYear: contains(backupLongTermRetentionPolicy, 'weekOfYear') ? backupLongTermRetentionPolicy.weekOfYear : 1
+    weeklyRetention: backupLongTermRetentionPolicy.?backupLongTermRetentionPolicy.weeklyRetention ?? ''
+    monthlyRetention: backupLongTermRetentionPolicy.?backupLongTermRetentionPolicy.monthlyRetention ?? ''
+    yearlyRetention: backupLongTermRetentionPolicy.?backupLongTermRetentionPolicy.yearlyRetention ?? ''
+    weekOfYear: backupLongTermRetentionPolicy.?backupLongTermRetentionPolicy.weekOfYear ?? 1
   }
 }
 
diff --git a/avm/res/sql/server/main.bicep b/avm/res/sql/server/main.bicep
index 100d49f9d9..a875bce3b8 100644
--- a/avm/res/sql/server/main.bicep
+++ b/avm/res/sql/server/main.bicep
@@ -238,48 +238,34 @@ module server_databases 'database/main.bicep' = [
     params: {
       name: database.name
       serverName: server.name
-      skuTier: contains(database, 'skuTier') ? database.skuTier : 'GeneralPurpose'
-      skuName: contains(database, 'skuName') ? database.skuName : 'GP_Gen5_2'
+      skuTier: database.?skuTier ?? 'GeneralPurpose'
+      skuName: database.?skuName ?? 'GP_Gen5_2'
       skuCapacity: database.?skuCapacity
-      skuFamily: contains(database, 'skuFamily') ? database.skuFamily : ''
-      skuSize: contains(database, 'skuSize') ? database.skuSize : ''
-      collation: contains(database, 'collation') ? database.collation : 'SQL_Latin1_General_CP1_CI_AS'
-      maxSizeBytes: contains(database, 'maxSizeBytes') ? database.maxSizeBytes : 34359738368
-      autoPauseDelay: contains(database, 'autoPauseDelay') ? database.autoPauseDelay : 0
+      skuFamily: database.?skuFamily ?? ''
+      skuSize: database.?skuSize ?? ''
+      collation: database.?collation ?? 'SQL_Latin1_General_CP1_CI_AS'
+      maxSizeBytes: database.?maxSizeBytes ?? 34359738368
+      autoPauseDelay: database.?autoPauseDelay ?? 0
       diagnosticSettings: database.?diagnosticSettings
-      isLedgerOn: contains(database, 'isLedgerOn') ? database.isLedgerOn : false
+      isLedgerOn: database.?isLedgerOn ?? false
       location: location
-      licenseType: contains(database, 'licenseType') ? database.licenseType : ''
-      maintenanceConfigurationId: contains(database, 'maintenanceConfigurationId')
-        ? database.maintenanceConfigurationId
-        : ''
-      minCapacity: contains(database, 'minCapacity') ? database.minCapacity : ''
-      highAvailabilityReplicaCount: contains(database, 'highAvailabilityReplicaCount')
-        ? database.highAvailabilityReplicaCount
-        : 0
-      readScale: contains(database, 'readScale') ? database.readScale : 'Disabled'
-      requestedBackupStorageRedundancy: contains(database, 'requestedBackupStorageRedundancy')
-        ? database.requestedBackupStorageRedundancy
-        : ''
-      sampleName: contains(database, 'sampleName') ? database.sampleName : ''
+      licenseType: database.?licenseType ?? ''
+      maintenanceConfigurationId: database.?maintenanceConfigurationId ?? ''
+      minCapacity: database.?minCapacity ?? ''
+      highAvailabilityReplicaCount: database.?highAvailabilityReplicaCount ?? 0
+      readScale: database.?readScale ?? 'Disabled'
+      requestedBackupStorageRedundancy: database.?requestedBackupStorageRedundancy ?? ''
+      sampleName: database.?sampleName ?? ''
       tags: database.?tags ?? tags
-      zoneRedundant: contains(database, 'zoneRedundant') ? database.zoneRedundant : false
-      elasticPoolId: contains(database, 'elasticPoolId') ? database.elasticPoolId : ''
-      backupShortTermRetentionPolicy: contains(database, 'backupShortTermRetentionPolicy')
-        ? database.backupShortTermRetentionPolicy
-        : {}
-      backupLongTermRetentionPolicy: contains(database, 'backupLongTermRetentionPolicy')
-        ? database.backupLongTermRetentionPolicy
-        : {}
-      createMode: contains(database, 'createMode') ? database.createMode : 'Default'
-      sourceDatabaseResourceId: contains(database, 'sourceDatabaseResourceId') ? database.sourceDatabaseResourceId : ''
-      sourceDatabaseDeletionDate: contains(database, 'sourceDatabaseDeletionDate')
-        ? database.sourceDatabaseDeletionDate
-        : ''
-      recoveryServicesRecoveryPointResourceId: contains(database, 'recoveryServicesRecoveryPointResourceId')
-        ? database.recoveryServicesRecoveryPointResourceId
-        : ''
-      restorePointInTime: contains(database, 'restorePointInTime') ? database.restorePointInTime : ''
+      zoneRedundant: database.?zoneRedundant ?? false
+      elasticPoolId: database.?elasticPoolId ?? ''
+      backupShortTermRetentionPolicy: database.?backupShortTermRetentionPolicy ?? {}
+      backupLongTermRetentionPolicy: database.?backupLongTermRetentionPolicy ?? {}
+      createMode: database.?createMode ?? 'Default'
+      sourceDatabaseResourceId: database.?sourceDatabaseResourceId ?? ''
+      sourceDatabaseDeletionDate: database.?sourceDatabaseDeletionDate ?? ''
+      recoveryServicesRecoveryPointResourceId: database.?recoveryServicesRecoveryPointResourceId ?? ''
+      restorePointInTime: database.?restorePointInTime ?? ''
     }
     dependsOn: [
       server_elasticPools // Enables us to add databases to existing elastic pools
@@ -293,19 +279,17 @@ module server_elasticPools 'elastic-pool/main.bicep' = [
     params: {
       name: elasticPool.name
       serverName: server.name
-      databaseMaxCapacity: contains(elasticPool, 'databaseMaxCapacity') ? elasticPool.databaseMaxCapacity : 2
-      databaseMinCapacity: contains(elasticPool, 'databaseMinCapacity') ? elasticPool.databaseMinCapacity : 0
+      databaseMaxCapacity: elasticPool.?databaseMaxCapacity ?? 2
+      databaseMinCapacity: elasticPool.?databaseMinCapacity ?? 0
       highAvailabilityReplicaCount: elasticPool.?highAvailabilityReplicaCount
-      licenseType: contains(elasticPool, 'licenseType') ? elasticPool.licenseType : 'LicenseIncluded'
-      maintenanceConfigurationId: contains(elasticPool, 'maintenanceConfigurationId')
-        ? elasticPool.maintenanceConfigurationId
-        : ''
-      maxSizeBytes: contains(elasticPool, 'maxSizeBytes') ? elasticPool.maxSizeBytes : 34359738368
+      licenseType: elasticPool.?licenseType ?? 'LicenseIncluded'
+      maintenanceConfigurationId: elasticPool.?maintenanceConfigurationId ?? ''
+      maxSizeBytes: elasticPool.?maxSizeBytes ?? 34359738368
       minCapacity: elasticPool.?minCapacity
-      skuCapacity: contains(elasticPool, 'skuCapacity') ? elasticPool.skuCapacity : 2
-      skuName: contains(elasticPool, 'skuName') ? elasticPool.skuName : 'GP_Gen5'
-      skuTier: contains(elasticPool, 'skuTier') ? elasticPool.skuTier : 'GeneralPurpose'
-      zoneRedundant: contains(elasticPool, 'zoneRedundant') ? elasticPool.zoneRedundant : false
+      skuCapacity: elasticPool.?skuCapacity ?? 2
+      skuName: elasticPool.?skuName ?? 'GP_Gen5'
+      skuTier: elasticPool.?skuTier ?? 'GeneralPurpose'
+      zoneRedundant: elasticPool.?zoneRedundant ?? false
       location: location
       tags: elasticPool.?tags ?? tags
     }
@@ -371,8 +355,8 @@ module server_firewallRules 'firewall-rule/main.bicep' = [
     params: {
       name: firewallRule.name
       serverName: server.name
-      endIpAddress: contains(firewallRule, 'endIpAddress') ? firewallRule.endIpAddress : '0.0.0.0'
-      startIpAddress: contains(firewallRule, 'startIpAddress') ? firewallRule.startIpAddress : '0.0.0.0'
+      endIpAddress: firewallRule.?endIpAddress ?? '0.0.0.0'
+      startIpAddress: firewallRule.?startIpAddress ?? '0.0.0.0'
     }
   }
 ]
@@ -383,9 +367,7 @@ module server_virtualNetworkRules 'virtual-network-rule/main.bicep' = [
     params: {
       name: virtualNetworkRule.name
       serverName: server.name
-      ignoreMissingVnetServiceEndpoint: contains(virtualNetworkRule, 'ignoreMissingVnetServiceEndpoint')
-        ? virtualNetworkRule.ignoreMissingVnetServiceEndpoint
-        : false
+      ignoreMissingVnetServiceEndpoint: virtualNetworkRule.?ignoreMissingVnetServiceEndpoint ?? false
       virtualNetworkSubnetId: virtualNetworkRule.virtualNetworkSubnetId
     }
   }
@@ -397,17 +379,13 @@ module server_securityAlertPolicies 'security-alert-policy/main.bicep' = [
     params: {
       name: securityAlertPolicy.name
       serverName: server.name
-      disabledAlerts: contains(securityAlertPolicy, 'disabledAlerts') ? securityAlertPolicy.disabledAlerts : []
-      emailAccountAdmins: contains(securityAlertPolicy, 'emailAccountAdmins')
-        ? securityAlertPolicy.emailAccountAdmins
-        : false
-      emailAddresses: contains(securityAlertPolicy, 'emailAddresses') ? securityAlertPolicy.emailAddresses : []
-      retentionDays: contains(securityAlertPolicy, 'retentionDays') ? securityAlertPolicy.retentionDays : 0
-      state: contains(securityAlertPolicy, 'state') ? securityAlertPolicy.state : 'Disabled'
-      storageAccountAccessKey: contains(securityAlertPolicy, 'storageAccountAccessKey')
-        ? securityAlertPolicy.storageAccountAccessKey
-        : ''
-      storageEndpoint: contains(securityAlertPolicy, 'storageEndpoint') ? securityAlertPolicy.storageEndpoint : ''
+      disabledAlerts: securityAlertPolicy.?securityAlertPolicy.disabledAlerts ?? []
+      emailAccountAdmins: securityAlertPolicy.?securityAlertPolicy.emailAccountAdmins ?? false
+      emailAddresses: securityAlertPolicy.?securityAlertPolicy.emailAddresses ?? []
+      retentionDays: securityAlertPolicy.?retentionDays ?? 0
+      state: securityAlertPolicy.?state ?? 'Disabled'
+      storageAccountAccessKey: securityAlertPolicy.?storageAccountAccessKey ?? ''
+      storageEndpoint: securityAlertPolicy.?storageEndpoint ?? ''
     }
   }
 ]
@@ -417,25 +395,12 @@ module server_vulnerabilityAssessment 'vulnerability-assessment/main.bicep' = if
   params: {
     serverName: server.name
     name: vulnerabilityAssessmentsObj.name
-    recurringScansEmails: contains(vulnerabilityAssessmentsObj, 'recurringScansEmails')
-      ? vulnerabilityAssessmentsObj.recurringScansEmails
-      : []
-    recurringScansEmailSubscriptionAdmins: contains(
-        vulnerabilityAssessmentsObj,
-        'recurringScansEmailSubscriptionAdmins'
-      )
-      ? vulnerabilityAssessmentsObj.recurringScansEmailSubscriptionAdmins
-      : false
-    recurringScansIsEnabled: contains(vulnerabilityAssessmentsObj, 'recurringScansIsEnabled')
-      ? vulnerabilityAssessmentsObj.recurringScansIsEnabled
-      : false
+    recurringScansEmails: vulnerabilityAssessmentsObj.?vulnerabilityAssessmentsObj.recurringScansEmails ?? []
+    recurringScansEmailSubscriptionAdmins: vulnerabilityAssessmentsObj.?vulnerabilityAssessmentsObj.recurringScansEmailSubscriptionAdmins ?? false
+    recurringScansIsEnabled: vulnerabilityAssessmentsObj.?recurringScansIsEnabled ?? false
     storageAccountResourceId: vulnerabilityAssessmentsObj.storageAccountResourceId
-    useStorageAccountAccessKey: contains(vulnerabilityAssessmentsObj, 'useStorageAccountAccessKey')
-      ? vulnerabilityAssessmentsObj.useStorageAccountAccessKey
-      : false
-    createStorageRoleAssignment: contains(vulnerabilityAssessmentsObj, 'createStorageRoleAssignment')
-      ? vulnerabilityAssessmentsObj.createStorageRoleAssignment
-      : true
+    useStorageAccountAccessKey: vulnerabilityAssessmentsObj.?useStorageAccountAccessKey ?? false
+    createStorageRoleAssignment: vulnerabilityAssessmentsObj.?createStorageRoleAssignment ?? true
   }
   dependsOn: [
     server_securityAlertPolicies
@@ -448,8 +413,8 @@ module server_keys 'key/main.bicep' = [
     params: {
       name: key.?name
       serverName: server.name
-      serverKeyType: contains(key, 'serverKeyType') ? key.serverKeyType : 'ServiceManaged'
-      uri: contains(key, 'uri') ? key.uri : ''
+      serverKeyType: key.?serverKeyType ?? 'ServiceManaged'
+      uri: key.?uri ?? ''
     }
   }
 ]
@@ -459,12 +424,8 @@ module server_encryptionProtector 'encryption-protector/main.bicep' = if (!empty
   params: {
     sqlServerName: server.name
     serverKeyName: encryptionProtectorObj.serverKeyName
-    serverKeyType: contains(encryptionProtectorObj, 'serverKeyType')
-      ? encryptionProtectorObj.serverKeyType
-      : 'ServiceManaged'
-    autoRotationEnabled: contains(encryptionProtectorObj, 'autoRotationEnabled')
-      ? encryptionProtectorObj.autoRotationEnabled
-      : true
+    serverKeyType: encryptionProtectorObj.?encryptionProtectorObj.serverKeyType ?? 'ServiceManaged'
+    autoRotationEnabled: encryptionProtectorObj.?encryptionProtectorObj.autoRotationEnabled ?? true
   }
   dependsOn: [
     server_keys
diff --git a/avm/res/sql/server/main.json b/avm/res/sql/server/main.json
index 78cff13981..3e096f5a7d 100644
--- a/avm/res/sql/server/main.json
+++ b/avm/res/sql/server/main.json
@@ -6,7 +6,7 @@
     "_generator": {
       "name": "bicep",
       "version": "0.29.47.4906",
-      "templateHash": "18130756437591455522"
+      "templateHash": "12784031181076258611"
     },
     "name": "Azure SQL Servers",
     "description": "This module deploys an Azure SQL Server.",
@@ -713,42 +713,90 @@
           "serverName": {
             "value": "[parameters('name')]"
           },
-          "skuTier": "[if(contains(parameters('databases')[copyIndex()], 'skuTier'), createObject('value', parameters('databases')[copyIndex()].skuTier), createObject('value', 'GeneralPurpose'))]",
-          "skuName": "[if(contains(parameters('databases')[copyIndex()], 'skuName'), createObject('value', parameters('databases')[copyIndex()].skuName), createObject('value', 'GP_Gen5_2'))]",
+          "skuTier": {
+            "value": "[coalesce(tryGet(parameters('databases')[copyIndex()], 'skuTier'), 'GeneralPurpose')]"
+          },
+          "skuName": {
+            "value": "[coalesce(tryGet(parameters('databases')[copyIndex()], 'skuName'), 'GP_Gen5_2')]"
+          },
           "skuCapacity": {
             "value": "[tryGet(parameters('databases')[copyIndex()], 'skuCapacity')]"
           },
-          "skuFamily": "[if(contains(parameters('databases')[copyIndex()], 'skuFamily'), createObject('value', parameters('databases')[copyIndex()].skuFamily), createObject('value', ''))]",
-          "skuSize": "[if(contains(parameters('databases')[copyIndex()], 'skuSize'), createObject('value', parameters('databases')[copyIndex()].skuSize), createObject('value', ''))]",
-          "collation": "[if(contains(parameters('databases')[copyIndex()], 'collation'), createObject('value', parameters('databases')[copyIndex()].collation), createObject('value', 'SQL_Latin1_General_CP1_CI_AS'))]",
-          "maxSizeBytes": "[if(contains(parameters('databases')[copyIndex()], 'maxSizeBytes'), createObject('value', parameters('databases')[copyIndex()].maxSizeBytes), createObject('value', json('34359738368')))]",
-          "autoPauseDelay": "[if(contains(parameters('databases')[copyIndex()], 'autoPauseDelay'), createObject('value', parameters('databases')[copyIndex()].autoPauseDelay), createObject('value', 0))]",
+          "skuFamily": {
+            "value": "[coalesce(tryGet(parameters('databases')[copyIndex()], 'skuFamily'), '')]"
+          },
+          "skuSize": {
+            "value": "[coalesce(tryGet(parameters('databases')[copyIndex()], 'skuSize'), '')]"
+          },
+          "collation": {
+            "value": "[coalesce(tryGet(parameters('databases')[copyIndex()], 'collation'), 'SQL_Latin1_General_CP1_CI_AS')]"
+          },
+          "maxSizeBytes": {
+            "value": "[coalesce(tryGet(parameters('databases')[copyIndex()], 'maxSizeBytes'), json('34359738368'))]"
+          },
+          "autoPauseDelay": {
+            "value": "[coalesce(tryGet(parameters('databases')[copyIndex()], 'autoPauseDelay'), 0)]"
+          },
           "diagnosticSettings": {
             "value": "[tryGet(parameters('databases')[copyIndex()], 'diagnosticSettings')]"
           },
-          "isLedgerOn": "[if(contains(parameters('databases')[copyIndex()], 'isLedgerOn'), createObject('value', parameters('databases')[copyIndex()].isLedgerOn), createObject('value', false()))]",
+          "isLedgerOn": {
+            "value": "[coalesce(tryGet(parameters('databases')[copyIndex()], 'isLedgerOn'), false())]"
+          },
           "location": {
             "value": "[parameters('location')]"
           },
-          "licenseType": "[if(contains(parameters('databases')[copyIndex()], 'licenseType'), createObject('value', parameters('databases')[copyIndex()].licenseType), createObject('value', ''))]",
-          "maintenanceConfigurationId": "[if(contains(parameters('databases')[copyIndex()], 'maintenanceConfigurationId'), createObject('value', parameters('databases')[copyIndex()].maintenanceConfigurationId), createObject('value', ''))]",
-          "minCapacity": "[if(contains(parameters('databases')[copyIndex()], 'minCapacity'), createObject('value', parameters('databases')[copyIndex()].minCapacity), createObject('value', ''))]",
-          "highAvailabilityReplicaCount": "[if(contains(parameters('databases')[copyIndex()], 'highAvailabilityReplicaCount'), createObject('value', parameters('databases')[copyIndex()].highAvailabilityReplicaCount), createObject('value', 0))]",
-          "readScale": "[if(contains(parameters('databases')[copyIndex()], 'readScale'), createObject('value', parameters('databases')[copyIndex()].readScale), createObject('value', 'Disabled'))]",
-          "requestedBackupStorageRedundancy": "[if(contains(parameters('databases')[copyIndex()], 'requestedBackupStorageRedundancy'), createObject('value', parameters('databases')[copyIndex()].requestedBackupStorageRedundancy), createObject('value', ''))]",
-          "sampleName": "[if(contains(parameters('databases')[copyIndex()], 'sampleName'), createObject('value', parameters('databases')[copyIndex()].sampleName), createObject('value', ''))]",
+          "licenseType": {
+            "value": "[coalesce(tryGet(parameters('databases')[copyIndex()], 'licenseType'), '')]"
+          },
+          "maintenanceConfigurationId": {
+            "value": "[coalesce(tryGet(parameters('databases')[copyIndex()], 'maintenanceConfigurationId'), '')]"
+          },
+          "minCapacity": {
+            "value": "[coalesce(tryGet(parameters('databases')[copyIndex()], 'minCapacity'), '')]"
+          },
+          "highAvailabilityReplicaCount": {
+            "value": "[coalesce(tryGet(parameters('databases')[copyIndex()], 'highAvailabilityReplicaCount'), 0)]"
+          },
+          "readScale": {
+            "value": "[coalesce(tryGet(parameters('databases')[copyIndex()], 'readScale'), 'Disabled')]"
+          },
+          "requestedBackupStorageRedundancy": {
+            "value": "[coalesce(tryGet(parameters('databases')[copyIndex()], 'requestedBackupStorageRedundancy'), '')]"
+          },
+          "sampleName": {
+            "value": "[coalesce(tryGet(parameters('databases')[copyIndex()], 'sampleName'), '')]"
+          },
           "tags": {
             "value": "[coalesce(tryGet(parameters('databases')[copyIndex()], 'tags'), parameters('tags'))]"
           },
-          "zoneRedundant": "[if(contains(parameters('databases')[copyIndex()], 'zoneRedundant'), createObject('value', parameters('databases')[copyIndex()].zoneRedundant), createObject('value', false()))]",
-          "elasticPoolId": "[if(contains(parameters('databases')[copyIndex()], 'elasticPoolId'), createObject('value', parameters('databases')[copyIndex()].elasticPoolId), createObject('value', ''))]",
-          "backupShortTermRetentionPolicy": "[if(contains(parameters('databases')[copyIndex()], 'backupShortTermRetentionPolicy'), createObject('value', parameters('databases')[copyIndex()].backupShortTermRetentionPolicy), createObject('value', createObject()))]",
-          "backupLongTermRetentionPolicy": "[if(contains(parameters('databases')[copyIndex()], 'backupLongTermRetentionPolicy'), createObject('value', parameters('databases')[copyIndex()].backupLongTermRetentionPolicy), createObject('value', createObject()))]",
-          "createMode": "[if(contains(parameters('databases')[copyIndex()], 'createMode'), createObject('value', parameters('databases')[copyIndex()].createMode), createObject('value', 'Default'))]",
-          "sourceDatabaseResourceId": "[if(contains(parameters('databases')[copyIndex()], 'sourceDatabaseResourceId'), createObject('value', parameters('databases')[copyIndex()].sourceDatabaseResourceId), createObject('value', ''))]",
-          "sourceDatabaseDeletionDate": "[if(contains(parameters('databases')[copyIndex()], 'sourceDatabaseDeletionDate'), createObject('value', parameters('databases')[copyIndex()].sourceDatabaseDeletionDate), createObject('value', ''))]",
-          "recoveryServicesRecoveryPointResourceId": "[if(contains(parameters('databases')[copyIndex()], 'recoveryServicesRecoveryPointResourceId'), createObject('value', parameters('databases')[copyIndex()].recoveryServicesRecoveryPointResourceId), createObject('value', ''))]",
-          "restorePointInTime": "[if(contains(parameters('databases')[copyIndex()], 'restorePointInTime'), createObject('value', parameters('databases')[copyIndex()].restorePointInTime), createObject('value', ''))]"
+          "zoneRedundant": {
+            "value": "[coalesce(tryGet(parameters('databases')[copyIndex()], 'zoneRedundant'), false())]"
+          },
+          "elasticPoolId": {
+            "value": "[coalesce(tryGet(parameters('databases')[copyIndex()], 'elasticPoolId'), '')]"
+          },
+          "backupShortTermRetentionPolicy": {
+            "value": "[coalesce(tryGet(parameters('databases')[copyIndex()], 'backupShortTermRetentionPolicy'), createObject())]"
+          },
+          "backupLongTermRetentionPolicy": {
+            "value": "[coalesce(tryGet(parameters('databases')[copyIndex()], 'backupLongTermRetentionPolicy'), createObject())]"
+          },
+          "createMode": {
+            "value": "[coalesce(tryGet(parameters('databases')[copyIndex()], 'createMode'), 'Default')]"
+          },
+          "sourceDatabaseResourceId": {
+            "value": "[coalesce(tryGet(parameters('databases')[copyIndex()], 'sourceDatabaseResourceId'), '')]"
+          },
+          "sourceDatabaseDeletionDate": {
+            "value": "[coalesce(tryGet(parameters('databases')[copyIndex()], 'sourceDatabaseDeletionDate'), '')]"
+          },
+          "recoveryServicesRecoveryPointResourceId": {
+            "value": "[coalesce(tryGet(parameters('databases')[copyIndex()], 'recoveryServicesRecoveryPointResourceId'), '')]"
+          },
+          "restorePointInTime": {
+            "value": "[coalesce(tryGet(parameters('databases')[copyIndex()], 'restorePointInTime'), '')]"
+          }
         },
         "template": {
           "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
@@ -758,7 +806,7 @@
             "_generator": {
               "name": "bicep",
               "version": "0.29.47.4906",
-              "templateHash": "8343448660522432164"
+              "templateHash": "18315314848268083867"
             },
             "name": "SQL Server Database",
             "description": "This module deploys an Azure SQL Server Database.",
@@ -1226,8 +1274,12 @@
                   "databaseName": {
                     "value": "[parameters('name')]"
                   },
-                  "diffBackupIntervalInHours": "[if(contains(parameters('backupShortTermRetentionPolicy'), 'diffBackupIntervalInHours'), createObject('value', parameters('backupShortTermRetentionPolicy').diffBackupIntervalInHours), createObject('value', 24))]",
-                  "retentionDays": "[if(contains(parameters('backupShortTermRetentionPolicy'), 'retentionDays'), createObject('value', parameters('backupShortTermRetentionPolicy').retentionDays), createObject('value', 7))]"
+                  "diffBackupIntervalInHours": {
+                    "value": "[coalesce(tryGet(parameters('backupShortTermRetentionPolicy'), 'backupShortTermRetentionPolicy', 'diffBackupIntervalInHours'), 24)]"
+                  },
+                  "retentionDays": {
+                    "value": "[coalesce(tryGet(parameters('backupShortTermRetentionPolicy'), 'backupShortTermRetentionPolicy', 'retentionDays'), 7)]"
+                  }
                 },
                 "template": {
                   "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
@@ -1326,10 +1378,18 @@
                   "databaseName": {
                     "value": "[parameters('name')]"
                   },
-                  "weeklyRetention": "[if(contains(parameters('backupLongTermRetentionPolicy'), 'weeklyRetention'), createObject('value', parameters('backupLongTermRetentionPolicy').weeklyRetention), createObject('value', ''))]",
-                  "monthlyRetention": "[if(contains(parameters('backupLongTermRetentionPolicy'), 'monthlyRetention'), createObject('value', parameters('backupLongTermRetentionPolicy').monthlyRetention), createObject('value', ''))]",
-                  "yearlyRetention": "[if(contains(parameters('backupLongTermRetentionPolicy'), 'yearlyRetention'), createObject('value', parameters('backupLongTermRetentionPolicy').yearlyRetention), createObject('value', ''))]",
-                  "weekOfYear": "[if(contains(parameters('backupLongTermRetentionPolicy'), 'weekOfYear'), createObject('value', parameters('backupLongTermRetentionPolicy').weekOfYear), createObject('value', 1))]"
+                  "weeklyRetention": {
+                    "value": "[coalesce(tryGet(parameters('backupLongTermRetentionPolicy'), 'backupLongTermRetentionPolicy', 'weeklyRetention'), '')]"
+                  },
+                  "monthlyRetention": {
+                    "value": "[coalesce(tryGet(parameters('backupLongTermRetentionPolicy'), 'backupLongTermRetentionPolicy', 'monthlyRetention'), '')]"
+                  },
+                  "yearlyRetention": {
+                    "value": "[coalesce(tryGet(parameters('backupLongTermRetentionPolicy'), 'backupLongTermRetentionPolicy', 'yearlyRetention'), '')]"
+                  },
+                  "weekOfYear": {
+                    "value": "[coalesce(tryGet(parameters('backupLongTermRetentionPolicy'), 'backupLongTermRetentionPolicy', 'weekOfYear'), 1)]"
+                  }
                 },
                 "template": {
                   "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
@@ -1486,21 +1546,39 @@
           "serverName": {
             "value": "[parameters('name')]"
           },
-          "databaseMaxCapacity": "[if(contains(parameters('elasticPools')[copyIndex()], 'databaseMaxCapacity'), createObject('value', parameters('elasticPools')[copyIndex()].databaseMaxCapacity), createObject('value', 2))]",
-          "databaseMinCapacity": "[if(contains(parameters('elasticPools')[copyIndex()], 'databaseMinCapacity'), createObject('value', parameters('elasticPools')[copyIndex()].databaseMinCapacity), createObject('value', 0))]",
+          "databaseMaxCapacity": {
+            "value": "[coalesce(tryGet(parameters('elasticPools')[copyIndex()], 'databaseMaxCapacity'), 2)]"
+          },
+          "databaseMinCapacity": {
+            "value": "[coalesce(tryGet(parameters('elasticPools')[copyIndex()], 'databaseMinCapacity'), 0)]"
+          },
           "highAvailabilityReplicaCount": {
             "value": "[tryGet(parameters('elasticPools')[copyIndex()], 'highAvailabilityReplicaCount')]"
           },
-          "licenseType": "[if(contains(parameters('elasticPools')[copyIndex()], 'licenseType'), createObject('value', parameters('elasticPools')[copyIndex()].licenseType), createObject('value', 'LicenseIncluded'))]",
-          "maintenanceConfigurationId": "[if(contains(parameters('elasticPools')[copyIndex()], 'maintenanceConfigurationId'), createObject('value', parameters('elasticPools')[copyIndex()].maintenanceConfigurationId), createObject('value', ''))]",
-          "maxSizeBytes": "[if(contains(parameters('elasticPools')[copyIndex()], 'maxSizeBytes'), createObject('value', parameters('elasticPools')[copyIndex()].maxSizeBytes), createObject('value', json('34359738368')))]",
+          "licenseType": {
+            "value": "[coalesce(tryGet(parameters('elasticPools')[copyIndex()], 'licenseType'), 'LicenseIncluded')]"
+          },
+          "maintenanceConfigurationId": {
+            "value": "[coalesce(tryGet(parameters('elasticPools')[copyIndex()], 'maintenanceConfigurationId'), '')]"
+          },
+          "maxSizeBytes": {
+            "value": "[coalesce(tryGet(parameters('elasticPools')[copyIndex()], 'maxSizeBytes'), json('34359738368'))]"
+          },
           "minCapacity": {
             "value": "[tryGet(parameters('elasticPools')[copyIndex()], 'minCapacity')]"
           },
-          "skuCapacity": "[if(contains(parameters('elasticPools')[copyIndex()], 'skuCapacity'), createObject('value', parameters('elasticPools')[copyIndex()].skuCapacity), createObject('value', 2))]",
-          "skuName": "[if(contains(parameters('elasticPools')[copyIndex()], 'skuName'), createObject('value', parameters('elasticPools')[copyIndex()].skuName), createObject('value', 'GP_Gen5'))]",
-          "skuTier": "[if(contains(parameters('elasticPools')[copyIndex()], 'skuTier'), createObject('value', parameters('elasticPools')[copyIndex()].skuTier), createObject('value', 'GeneralPurpose'))]",
-          "zoneRedundant": "[if(contains(parameters('elasticPools')[copyIndex()], 'zoneRedundant'), createObject('value', parameters('elasticPools')[copyIndex()].zoneRedundant), createObject('value', false()))]",
+          "skuCapacity": {
+            "value": "[coalesce(tryGet(parameters('elasticPools')[copyIndex()], 'skuCapacity'), 2)]"
+          },
+          "skuName": {
+            "value": "[coalesce(tryGet(parameters('elasticPools')[copyIndex()], 'skuName'), 'GP_Gen5')]"
+          },
+          "skuTier": {
+            "value": "[coalesce(tryGet(parameters('elasticPools')[copyIndex()], 'skuTier'), 'GeneralPurpose')]"
+          },
+          "zoneRedundant": {
+            "value": "[coalesce(tryGet(parameters('elasticPools')[copyIndex()], 'zoneRedundant'), false())]"
+          },
           "location": {
             "value": "[parameters('location')]"
           },
@@ -2411,8 +2489,12 @@
           "serverName": {
             "value": "[parameters('name')]"
           },
-          "endIpAddress": "[if(contains(parameters('firewallRules')[copyIndex()], 'endIpAddress'), createObject('value', parameters('firewallRules')[copyIndex()].endIpAddress), createObject('value', '0.0.0.0'))]",
-          "startIpAddress": "[if(contains(parameters('firewallRules')[copyIndex()], 'startIpAddress'), createObject('value', parameters('firewallRules')[copyIndex()].startIpAddress), createObject('value', '0.0.0.0'))]"
+          "endIpAddress": {
+            "value": "[coalesce(tryGet(parameters('firewallRules')[copyIndex()], 'endIpAddress'), '0.0.0.0')]"
+          },
+          "startIpAddress": {
+            "value": "[coalesce(tryGet(parameters('firewallRules')[copyIndex()], 'startIpAddress'), '0.0.0.0')]"
+          }
         },
         "template": {
           "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
@@ -2515,7 +2597,9 @@
           "serverName": {
             "value": "[parameters('name')]"
           },
-          "ignoreMissingVnetServiceEndpoint": "[if(contains(parameters('virtualNetworkRules')[copyIndex()], 'ignoreMissingVnetServiceEndpoint'), createObject('value', parameters('virtualNetworkRules')[copyIndex()].ignoreMissingVnetServiceEndpoint), createObject('value', false()))]",
+          "ignoreMissingVnetServiceEndpoint": {
+            "value": "[coalesce(tryGet(parameters('virtualNetworkRules')[copyIndex()], 'ignoreMissingVnetServiceEndpoint'), false())]"
+          },
           "virtualNetworkSubnetId": {
             "value": "[parameters('virtualNetworkRules')[copyIndex()].virtualNetworkSubnetId]"
           }
@@ -2620,13 +2704,27 @@
           "serverName": {
             "value": "[parameters('name')]"
           },
-          "disabledAlerts": "[if(contains(parameters('securityAlertPolicies')[copyIndex()], 'disabledAlerts'), createObject('value', parameters('securityAlertPolicies')[copyIndex()].disabledAlerts), createObject('value', createArray()))]",
-          "emailAccountAdmins": "[if(contains(parameters('securityAlertPolicies')[copyIndex()], 'emailAccountAdmins'), createObject('value', parameters('securityAlertPolicies')[copyIndex()].emailAccountAdmins), createObject('value', false()))]",
-          "emailAddresses": "[if(contains(parameters('securityAlertPolicies')[copyIndex()], 'emailAddresses'), createObject('value', parameters('securityAlertPolicies')[copyIndex()].emailAddresses), createObject('value', createArray()))]",
-          "retentionDays": "[if(contains(parameters('securityAlertPolicies')[copyIndex()], 'retentionDays'), createObject('value', parameters('securityAlertPolicies')[copyIndex()].retentionDays), createObject('value', 0))]",
-          "state": "[if(contains(parameters('securityAlertPolicies')[copyIndex()], 'state'), createObject('value', parameters('securityAlertPolicies')[copyIndex()].state), createObject('value', 'Disabled'))]",
-          "storageAccountAccessKey": "[if(contains(parameters('securityAlertPolicies')[copyIndex()], 'storageAccountAccessKey'), createObject('value', parameters('securityAlertPolicies')[copyIndex()].storageAccountAccessKey), createObject('value', ''))]",
-          "storageEndpoint": "[if(contains(parameters('securityAlertPolicies')[copyIndex()], 'storageEndpoint'), createObject('value', parameters('securityAlertPolicies')[copyIndex()].storageEndpoint), createObject('value', ''))]"
+          "disabledAlerts": {
+            "value": "[coalesce(tryGet(parameters('securityAlertPolicies')[copyIndex()], 'securityAlertPolicy', 'disabledAlerts'), createArray())]"
+          },
+          "emailAccountAdmins": {
+            "value": "[coalesce(tryGet(parameters('securityAlertPolicies')[copyIndex()], 'securityAlertPolicy', 'emailAccountAdmins'), false())]"
+          },
+          "emailAddresses": {
+            "value": "[coalesce(tryGet(parameters('securityAlertPolicies')[copyIndex()], 'securityAlertPolicy', 'emailAddresses'), createArray())]"
+          },
+          "retentionDays": {
+            "value": "[coalesce(tryGet(parameters('securityAlertPolicies')[copyIndex()], 'retentionDays'), 0)]"
+          },
+          "state": {
+            "value": "[coalesce(tryGet(parameters('securityAlertPolicies')[copyIndex()], 'state'), 'Disabled')]"
+          },
+          "storageAccountAccessKey": {
+            "value": "[coalesce(tryGet(parameters('securityAlertPolicies')[copyIndex()], 'storageAccountAccessKey'), '')]"
+          },
+          "storageEndpoint": {
+            "value": "[coalesce(tryGet(parameters('securityAlertPolicies')[copyIndex()], 'storageEndpoint'), '')]"
+          }
         },
         "template": {
           "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
@@ -2770,14 +2868,24 @@
           "name": {
             "value": "[parameters('vulnerabilityAssessmentsObj').name]"
           },
-          "recurringScansEmails": "[if(contains(parameters('vulnerabilityAssessmentsObj'), 'recurringScansEmails'), createObject('value', parameters('vulnerabilityAssessmentsObj').recurringScansEmails), createObject('value', createArray()))]",
-          "recurringScansEmailSubscriptionAdmins": "[if(contains(parameters('vulnerabilityAssessmentsObj'), 'recurringScansEmailSubscriptionAdmins'), createObject('value', parameters('vulnerabilityAssessmentsObj').recurringScansEmailSubscriptionAdmins), createObject('value', false()))]",
-          "recurringScansIsEnabled": "[if(contains(parameters('vulnerabilityAssessmentsObj'), 'recurringScansIsEnabled'), createObject('value', parameters('vulnerabilityAssessmentsObj').recurringScansIsEnabled), createObject('value', false()))]",
+          "recurringScansEmails": {
+            "value": "[coalesce(tryGet(parameters('vulnerabilityAssessmentsObj'), 'vulnerabilityAssessmentsObj', 'recurringScansEmails'), createArray())]"
+          },
+          "recurringScansEmailSubscriptionAdmins": {
+            "value": "[coalesce(tryGet(parameters('vulnerabilityAssessmentsObj'), 'vulnerabilityAssessmentsObj', 'recurringScansEmailSubscriptionAdmins'), false())]"
+          },
+          "recurringScansIsEnabled": {
+            "value": "[coalesce(tryGet(parameters('vulnerabilityAssessmentsObj'), 'recurringScansIsEnabled'), false())]"
+          },
           "storageAccountResourceId": {
             "value": "[parameters('vulnerabilityAssessmentsObj').storageAccountResourceId]"
           },
-          "useStorageAccountAccessKey": "[if(contains(parameters('vulnerabilityAssessmentsObj'), 'useStorageAccountAccessKey'), createObject('value', parameters('vulnerabilityAssessmentsObj').useStorageAccountAccessKey), createObject('value', false()))]",
-          "createStorageRoleAssignment": "[if(contains(parameters('vulnerabilityAssessmentsObj'), 'createStorageRoleAssignment'), createObject('value', parameters('vulnerabilityAssessmentsObj').createStorageRoleAssignment), createObject('value', true()))]"
+          "useStorageAccountAccessKey": {
+            "value": "[coalesce(tryGet(parameters('vulnerabilityAssessmentsObj'), 'useStorageAccountAccessKey'), false())]"
+          },
+          "createStorageRoleAssignment": {
+            "value": "[coalesce(tryGet(parameters('vulnerabilityAssessmentsObj'), 'createStorageRoleAssignment'), true())]"
+          }
         },
         "template": {
           "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
@@ -2967,8 +3075,12 @@
           "serverName": {
             "value": "[parameters('name')]"
           },
-          "serverKeyType": "[if(contains(parameters('keys')[copyIndex()], 'serverKeyType'), createObject('value', parameters('keys')[copyIndex()].serverKeyType), createObject('value', 'ServiceManaged'))]",
-          "uri": "[if(contains(parameters('keys')[copyIndex()], 'uri'), createObject('value', parameters('keys')[copyIndex()].uri), createObject('value', ''))]"
+          "serverKeyType": {
+            "value": "[coalesce(tryGet(parameters('keys')[copyIndex()], 'serverKeyType'), 'ServiceManaged')]"
+          },
+          "uri": {
+            "value": "[coalesce(tryGet(parameters('keys')[copyIndex()], 'uri'), '')]"
+          }
         },
         "template": {
           "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
@@ -3087,8 +3199,12 @@
           "serverKeyName": {
             "value": "[parameters('encryptionProtectorObj').serverKeyName]"
           },
-          "serverKeyType": "[if(contains(parameters('encryptionProtectorObj'), 'serverKeyType'), createObject('value', parameters('encryptionProtectorObj').serverKeyType), createObject('value', 'ServiceManaged'))]",
-          "autoRotationEnabled": "[if(contains(parameters('encryptionProtectorObj'), 'autoRotationEnabled'), createObject('value', parameters('encryptionProtectorObj').autoRotationEnabled), createObject('value', true()))]"
+          "serverKeyType": {
+            "value": "[coalesce(tryGet(parameters('encryptionProtectorObj'), 'encryptionProtectorObj', 'serverKeyType'), 'ServiceManaged')]"
+          },
+          "autoRotationEnabled": {
+            "value": "[coalesce(tryGet(parameters('encryptionProtectorObj'), 'encryptionProtectorObj', 'autoRotationEnabled'), true())]"
+          }
         },
         "template": {
           "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
diff --git a/avm/res/sql/server/tests/e2e/admin/main.test.bicep b/avm/res/sql/server/tests/e2e/admin/main.test.bicep
index 622de8c80a..3fb8371c1f 100644
--- a/avm/res/sql/server/tests/e2e/admin/main.test.bicep
+++ b/avm/res/sql/server/tests/e2e/admin/main.test.bicep
@@ -15,7 +15,7 @@ param resourceGroupName string = 'dep-${namePrefix}-sql.servers-${serviceShort}-
 param resourceLocation string = deployment().location
 
 @description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
-param serviceShort string = 'sqlsadmin'
+param serviceShort string = 'sqladmin'
 
 @description('Optional. A token to inject into the name of each resource.')
 param namePrefix string = '#_namePrefix_#'
diff --git a/avm/res/sql/server/tests/e2e/audit/main.test.bicep b/avm/res/sql/server/tests/e2e/audit/main.test.bicep
index dee526795e..5e242b05ef 100644
--- a/avm/res/sql/server/tests/e2e/audit/main.test.bicep
+++ b/avm/res/sql/server/tests/e2e/audit/main.test.bicep
@@ -41,7 +41,7 @@ module nestedDependencies 'dependencies.bicep' = {
   scope: resourceGroup
   name: '${uniqueString(deployment().name, resourceLocation)}-nestedDependencies'
   params: {
-    storageAccountName: 'dep${namePrefix}audstore${serviceShort}'
+    storageAccountName: 'dep${namePrefix}audstore${serviceShort}01'
     location: resourceLocation
   }
 }
diff --git a/avm/res/sql/server/tests/e2e/max/main.test.bicep b/avm/res/sql/server/tests/e2e/max/main.test.bicep
index 5487641c7f..2f77f58340 100644
--- a/avm/res/sql/server/tests/e2e/max/main.test.bicep
+++ b/avm/res/sql/server/tests/e2e/max/main.test.bicep
@@ -52,7 +52,7 @@ module diagnosticDependencies '../../../../../../utilities/e2e-template-assets/t
   scope: resourceGroup
   name: '${uniqueString(deployment().name, resourceLocation)}-diagnosticDependencies'
   params: {
-    storageAccountName: 'dep${namePrefix}azsa${serviceShort}01'
+    storageAccountName: 'dep${namePrefix}azsa${serviceShort}02'
     logAnalyticsWorkspaceName: 'dep-${namePrefix}-law-${serviceShort}'
     eventHubNamespaceEventHubName: 'dep-${namePrefix}-evh-${serviceShort}'
     eventHubNamespaceName: 'dep-${namePrefix}-evhns-${serviceShort}'
@@ -162,6 +162,11 @@ module testDeployment '../../../main.bicep' = {
         name: 'Default'
         state: 'Enabled'
         emailAccountAdmins: true
+        disabledAlerts: []
+        emailAddresses: [
+          'test1@contoso.com'
+          'test2@contoso.com'
+        ]
       }
     ]
     keys: [
diff --git a/avm/res/sql/server/tests/e2e/secondary/main.test.bicep b/avm/res/sql/server/tests/e2e/secondary/main.test.bicep
index d86a8377b4..72da16ed82 100644
--- a/avm/res/sql/server/tests/e2e/secondary/main.test.bicep
+++ b/avm/res/sql/server/tests/e2e/secondary/main.test.bicep
@@ -15,7 +15,7 @@ param resourceGroupName string = 'dep-${namePrefix}-sql.servers-${serviceShort}-
 param resourceLocation string = deployment().location
 
 @description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
-param serviceShort string = 'sqlsec'
+param serviceShort string = 'sqlsc'
 
 @description('Optional. The password to leverage for the login.')
 @secure()
diff --git a/avm/res/sql/server/tests/e2e/vulnAssm/main.test.bicep b/avm/res/sql/server/tests/e2e/vulnAssm/main.test.bicep
index 3b01629f48..ba44d688cd 100644
--- a/avm/res/sql/server/tests/e2e/vulnAssm/main.test.bicep
+++ b/avm/res/sql/server/tests/e2e/vulnAssm/main.test.bicep
@@ -15,7 +15,7 @@ param resourceGroupName string = 'dep-${namePrefix}-sql.servers-${serviceShort}-
 param resourceLocation string = deployment().location
 
 @description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.')
-param serviceShort string = 'sqlsvln'
+param serviceShort string = 'sqlvln'
 
 @description('Optional. The password to leverage for the login.')
 @secure()
@@ -75,6 +75,11 @@ module testDeployment '../../../main.bicep' = {
         name: 'Default'
         state: 'Enabled'
         emailAccountAdmins: true
+        disabledAlerts: []
+        emailAddresses: [
+          'test1@contoso.com'
+          'test2@contoso.com'
+        ]
       }
     ]
     managedIdentities: {
diff --git a/avm/res/sql/server/tests/e2e/waf-aligned/main.test.bicep b/avm/res/sql/server/tests/e2e/waf-aligned/main.test.bicep
index d0c16ff2b9..fad4fccd07 100644
--- a/avm/res/sql/server/tests/e2e/waf-aligned/main.test.bicep
+++ b/avm/res/sql/server/tests/e2e/waf-aligned/main.test.bicep
@@ -48,7 +48,7 @@ module diagnosticDependencies '../../../../../../utilities/e2e-template-assets/t
   scope: resourceGroup
   name: '${uniqueString(deployment().name, resourceLocation)}-diagnosticDependencies'
   params: {
-    storageAccountName: 'dep${namePrefix}azsa${serviceShort}01'
+    storageAccountName: 'dep${namePrefix}azsa${serviceShort}02'
     logAnalyticsWorkspaceName: 'dep-${namePrefix}-law-${serviceShort}'
     eventHubNamespaceEventHubName: 'dep-${namePrefix}-evh-${serviceShort}'
     eventHubNamespaceName: 'dep-${namePrefix}-evhns-${serviceShort}'
@@ -130,6 +130,11 @@ module testDeployment '../../../main.bicep' = {
         name: 'Default'
         state: 'Enabled'
         emailAccountAdmins: true
+        disabledAlerts: []
+        emailAddresses: [
+          'test1@contoso.com'
+          'test2@contoso.com'
+        ]
       }
     ]
     keys: [