diff --git a/eng/pipelines/agent-software-inventory.yml b/eng/pipelines/agent-software-inventory.yml
index 101c1cb31f8..9b90605ed40 100644
--- a/eng/pipelines/agent-software-inventory.yml
+++ b/eng/pipelines/agent-software-inventory.yml
@@ -34,10 +34,6 @@ jobs:
         Pool: azsdk-pool-mms-win-2022-general
         OSVmImage: MMS2022
         Host: Windows
-      CustomMacOS:
-        Pool: Azure Pipelines
-        OSVmImage: macos-latest
-        Host: MacOS
 
   pool:
     name: $(Pool)
@@ -126,6 +122,22 @@ jobs:
       } > powershell-inventory.csv
     displayName: PowerShell modules
     workingDirectory: $(Build.ArtifactStagingDirectory)
+  
+  - pwsh: |
+      Get-ChildItem "${env:ProgramFiles}" | ForEach-Object {
+        "$(Host), $(OSVmImage), ProgramFiles, $($_.Name), , all"
+      } > programfiles-inventory.csv
+    displayName: Program Files
+    workingDirectory: $(Build.ArtifactStagingDirectory)
+    condition: and(succeeded(), eq(variables.Host, 'Windows'))
+
+  - pwsh: |
+      Get-ChildItem "${env:ProgramFiles(x86)}" | ForEach-Object {
+        "$(Host), $(OSVmImage), ProgramFilesX86, $($_.Name), , all"
+      } >> programfiles-inventory.csv
+    displayName: Program Files (x86)
+    workingDirectory: $(Build.ArtifactStagingDirectory)
+    condition: and(succeeded(), eq(variables.Host, 'Windows'))
 
   - publish: $(Build.ArtifactStagingDirectory)
     displayName: Publish inventory-$(OSVmImage)
@@ -133,6 +145,7 @@ jobs:
 
 - job: assemble
   dependsOn: inventory
+  condition: succeededOrFailed()
   pool:
     vmImage: ubuntu-latest
   steps: