diff --git a/.config/tsaoptions.json b/.config/tsaoptions.json
index 0f1ded2d..eb7c1edc 100644
--- a/.config/tsaoptions.json
+++ b/.config/tsaoptions.json
@@ -1,7 +1,7 @@
 {
     "instanceUrl": "https://msazure.visualstudio.com",
     "projectName": "One",
-    "areaPath": "One\\MGMT\\Compute\\Powershell\\Powershell\\PowerShell Core",
+    "areaPath": "One\\MGMT\\Compute\\Powershell\\Powershell\\PowerShell Core\\AIShell",
     "notificationAliases": [
         "dongbow@microsoft.com",
         "slee@microsoft.com"
diff --git a/.pipelines/templates/linux-build.yml b/.pipelines/templates/linux-build.yml
index 342b3ee1..44067088 100644
--- a/.pipelines/templates/linux-build.yml
+++ b/.pipelines/templates/linux-build.yml
@@ -148,6 +148,18 @@ jobs:
     env:
       ob_restore_phase: true
 
+  - template: /.pipelines/templates/update-nuget-config.yml@self
+    parameters:
+      repoRoot: $(repoRoot)
+
+  - pwsh: |
+      Import-Module $(repoRoot)/build.psm1 -Force
+      Install-Dotnet
+      Start-Build -Configuration Release -Clean -NotIncludeModule -Verbose
+    displayName: 'Build again to get correct SBOM'
+    env:
+      ob_restore_phase: true
+
   - task: DownloadPipelineArtifact@2
     inputs:
       artifact: drop_linux_build_$(Architecture)
diff --git a/.pipelines/templates/mac-build.yml b/.pipelines/templates/mac-build.yml
index 4c7c1f12..aa72e1ef 100644
--- a/.pipelines/templates/mac-build.yml
+++ b/.pipelines/templates/mac-build.yml
@@ -64,6 +64,8 @@ jobs:
         Write-Host "##vso[artifact.upload containerfolder=$artifactName;artifactname=$artifactName]$($result.App)"
       }
     displayName: 'Build macOS'
+    env:
+      ob_restore_phase: true
 
   - template: /.pipelines/templates/finalize.yml@self
 
@@ -109,6 +111,18 @@ jobs:
     env:
       ob_restore_phase: true
 
+  - template: /.pipelines/templates/update-nuget-config.yml@self
+    parameters:
+      repoRoot: $(repoRoot)
+
+  - pwsh: |
+      Import-Module $(repoRoot)/build.psm1 -Force
+      Install-Dotnet
+      Start-Build -Configuration Release -Clean -NotIncludeModule -Verbose
+    displayName: 'Build again to get correct SBOM'
+    env:
+      ob_restore_phase: true
+
   - task: DownloadPipelineArtifact@2
     inputs:
       artifact: 'macBuild-$(Architecture)'
diff --git a/.pipelines/templates/module-build.yml b/.pipelines/templates/module-build.yml
index fa6cefac..d87e87e6 100644
--- a/.pipelines/templates/module-build.yml
+++ b/.pipelines/templates/module-build.yml
@@ -137,6 +137,18 @@ jobs:
     env:
       ob_restore_phase: true
 
+  - template: /.pipelines/templates/update-nuget-config.yml@self
+    parameters:
+      repoRoot: $(repoRoot)
+
+  - pwsh: |
+      Import-Module $(repoRoot)\build.psm1 -Force
+      Install-Dotnet
+      dotnet restore '$(repoRoot)\shell\AIShell.Integration'
+    displayName: 'Restore to get correct SBOM'
+    env:
+      ob_restore_phase: true
+
   - task: DownloadPipelineArtifact@2
     inputs:
       artifact: drop_module_build