diff --git a/CI/Azure-DevOps/AZ_MainPipeline.yml b/CI/Azure-DevOps/AZ_MainPipeline.yml
index 513949bb4..6319c306d 100644
--- a/CI/Azure-DevOps/AZ_MainPipeline.yml
+++ b/CI/Azure-DevOps/AZ_MainPipeline.yml
@@ -86,7 +86,7 @@ stages:
 
     - task: AzureKeyVault@1
       inputs:
-        azureSubscription: 'tSQLt CI Subscription(58c04a99-5b92-410c-9e41-10262f68ca80)'
+        azureSubscription: 'Azure DevOps Main Pipeline Service Principal'
         KeyVaultName: 'tSQLtSigningKey'
 
     - task: PowerShell@2
@@ -112,7 +112,7 @@ stages:
         SQLPORTMINIMUM: $(SqlPortMinimum)
         SQLPORTMAXIMUM: $(SqlPortMaximum)
       inputs:
-        azureSubscription: 'tSQLt CI Subscription(58c04a99-5b92-410c-9e41-10262f68ca80)'
+        azureSubscription: 'Azure DevOps Main Pipeline Service Principal'
         azurePowerShellVersion: 'LatestVersion'
         scriptType: ps
         scriptLocation: inlineScript
@@ -199,7 +199,7 @@ stages:
 
     - task: AzureKeyVault@1
       inputs:
-        azureSubscription: 'tSQLt CI Subscription(58c04a99-5b92-410c-9e41-10262f68ca80)'
+        azureSubscription: 'Azure DevOps Main Pipeline Service Principal'
         KeyVaultName: 'tSQLtSigningKey'
 
     - task: PowerShell@2
@@ -407,7 +407,7 @@ stages:
 
     - task: AzureKeyVault@1
       inputs:
-        azureSubscription: 'tSQLt CI Subscription(58c04a99-5b92-410c-9e41-10262f68ca80)'
+        azureSubscription: 'Azure DevOps Main Pipeline Service Principal'
         KeyVaultName: 'tSQLtSigningKey'
 
     - task: PowerShell@2
@@ -646,7 +646,7 @@ stages:
     - task: AzureCLI@2
       name: DeleteAzureVM
       inputs:
-        azureSubscription: 'tSQLt CI Subscription(58c04a99-5b92-410c-9e41-10262f68ca80)'
+        azureSubscription: 'Azure DevOps Main Pipeline Service Principal'
         azurePowerShellVersion: 'LatestVersion'
         scriptType: ps
         scriptLocation: inlineScript
diff --git a/CI/Azure-DevOps/CreateSQLVM_azcli.ps1 b/CI/Azure-DevOps/CreateSQLVM_azcli.ps1
index c347309b4..3eff8837d 100644
--- a/CI/Azure-DevOps/CreateSQLVM_azcli.ps1
+++ b/CI/Azure-DevOps/CreateSQLVM_azcli.ps1
@@ -129,7 +129,7 @@ Log-Output "Creating VM $VMName";
 
 $output = az vm create --name "$VMName" --resource-group "$ResourceGroupName" --location "$Location" --admin-password "$VMAdminPwd" `
             --admin-username "$VMAdminName" --computer-name "$VMName" --image "$ImageUrn" --nics "$InterfaceName" --priority Spot `
-            --size $Size | ConvertFrom-Json;
+            --size $Size --data-disk-sizes-gb 8 | ConvertFrom-Json;
 if (!$output) {
     Log-Output "VMName: ", $VMName;
     Log-Output "ResourceGroupName: ", $ResourceGroupName;
@@ -154,7 +154,7 @@ $output = az deployment group create --resource-group $ResourceGroupName --templ
 if (!$output) {
     Write-Error "Error creating SqlVM";
     return;
-}
+}   
 $SQLVM|Out-String|Log-Output;
 Log-Output 'DONE: Applying SqlVM Config'
 
diff --git a/CI/Azure-DevOps/CreateSqlVirtualMachineTemplate.bicep b/CI/Azure-DevOps/CreateSqlVirtualMachineTemplate.bicep
index 36697091c..3bcd13852 100644
--- a/CI/Azure-DevOps/CreateSqlVirtualMachineTemplate.bicep
+++ b/CI/Azure-DevOps/CreateSqlVirtualMachineTemplate.bicep
@@ -1,7 +1,15 @@
 param sqlConnectivityType string = 'Public'
 param sqlPortNumber int = 41433
-param sqlStorageWorkloadType string = 'DW'
+param sqlStorageWorkloadType string = 'General'
 param sqlStorageDisksConfigurationType string = 'NEW'
+param sqlDataSettingsDefaultFilePath string = 'F:\\data'
+param sqlDataSettingsLUNs array = [
+  0
+]
+param sqlLogSettingsDefaultFilePath string = 'F:\\log'
+param sqlLogSettingsLUNs array = [
+  0
+]
 param sqlAutopatchingDayOfWeek string = 'Sunday'
 param sqlAutopatchingStartHour int = 2
 param sqlAutopatchingWindowDuration int = 60
@@ -29,6 +37,14 @@ resource newVMName_resource 'Microsoft.SqlVirtualMachine/SqlVirtualMachines@2017
     }
     storageConfigurationSettings: {
       diskConfigurationType: sqlStorageDisksConfigurationType
+      sqlDataSettings : {
+        luns: sqlDataSettingsLUNs
+        defaultFilePath: sqlDataSettingsDefaultFilePath
+      }
+      sqlLogSettings: {
+        luns: sqlLogSettingsLUNs
+        defaultFilePath: sqlLogSettingsDefaultFilePath
+      }
       storageWorkloadType: sqlStorageWorkloadType
     }
     serverConfigurationsManagementSettings: {