diff --git a/infra/main.bicep b/infra/main.bicep
index bf7bf9aa1..13e3f1983 100644
--- a/infra/main.bicep
+++ b/infra/main.bicep
@@ -2021,7 +2021,7 @@ module keyvault 'br/public:avm/res/key-vault/vault:0.12.1' = {
     enableSoftDelete: true
     softDeleteRetentionInDays: 7
     diagnosticSettings: enableMonitoring 
-      ? [{ workspaceResourceId: logAnalyticsWorkspace!.outputs.resourceId }] 
+      ? [{ workspaceResourceId: logAnalyticsWorkspaceResourceId }] 
       : []
     // WAF aligned configuration for Private Networking
     privateEndpoints: enablePrivateNetworking
diff --git a/infra/main_custom.bicep b/infra/main_custom.bicep
index c36c7bff0..3003b0c21 100644
--- a/infra/main_custom.bicep
+++ b/infra/main_custom.bicep
@@ -2062,7 +2062,7 @@ module keyvault 'br/public:avm/res/key-vault/vault:0.12.1' = {
     enableSoftDelete: true
     softDeleteRetentionInDays: 7
     diagnosticSettings: enableMonitoring 
-      ? [{ workspaceResourceId: logAnalyticsWorkspace!.outputs.resourceId }] 
+      ? [{ workspaceResourceId: logAnalyticsWorkspaceResourceId }] 
       : []
     // WAF aligned configuration for Private Networking
     privateEndpoints: enablePrivateNetworking