diff --git a/workload/bicep/deploy-baseline.bicep b/workload/bicep/deploy-baseline.bicep
index 057ffd827..bbf190eef 100644
--- a/workload/bicep/deploy-baseline.bicep
+++ b/workload/bicep/deploy-baseline.bicep
@@ -1419,7 +1419,7 @@ module managementVm './modules/storageAzureFiles/.bicep/managementVm.bicep' = if
   ]
 }
 // Key vault for Storage Account(s) with key for each, 1y expiry and rotation policy for FSLogix and MSIX (CMK)
-module strgKeyVault '../../avm/1.0.0/res/key-vault/vault/main.bicep' = if ((varCreateStorageDeployment) && (diskZeroTrust)) {
+module strgKeyVault '../../avm/1.0.0/res/key-vault/vault/main.bicep' = if ((varCreateStorageDeployment) && (storageZeroTrust)) {
   scope: resourceGroup('${avdWorkloadSubsId}', '${varStorageObjectsRgName}')
   name: 'Storage-KeyVault-${time}'
   params: {
diff --git a/workload/bicep/deploy-baseline.json b/workload/bicep/deploy-baseline.json
index bf7a00ed9..00f3f086c 100644
--- a/workload/bicep/deploy-baseline.json
+++ b/workload/bicep/deploy-baseline.json
@@ -5,7 +5,7 @@
     "_generator": {
       "name": "bicep",
       "version": "0.31.34.60546",
-      "templateHash": "9121813628569754715"
+      "templateHash": "9384301259839648600"
     },
     "name": "AVD Accelerator - Baseline Deployment",
     "description": "AVD Accelerator - Deployment Baseline",
@@ -26625,7 +26625,7 @@
       ]
     },
     {
-      "condition": "[and(variables('varCreateStorageDeployment'), parameters('diskZeroTrust'))]",
+      "condition": "[and(variables('varCreateStorageDeployment'), parameters('storageZeroTrust'))]",
       "type": "Microsoft.Resources/deployments",
       "apiVersion": "2022-09-01",
       "name": "[format('Storage-KeyVault-{0}', parameters('time'))]",