diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index d155a92975f..6e9d72a1c3c 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -226,8 +226,7 @@ jobs:
 
   - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
     displayName: 'SBOM'
-    condition: eq(variables['Build.Reason'], 'BatchedCI')
-    continueOnError: true
+    condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/release')
     inputs:
       BuildDropPath: 'build_scripts/windows/out/'
 
@@ -272,8 +271,7 @@ jobs:
 
     - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
       displayName: 'SBOM'
-      condition: eq(variables['Build.Reason'], 'BatchedCI')
-      continueOnError: true
+      condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/release')
       inputs:
         BuildDropPath: 'build_scripts/windows/out/'
 
@@ -374,8 +372,7 @@ jobs:
 
     - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
       displayName: 'SBOM'
-      condition: eq(variables['Build.Reason'], 'BatchedCI')
-      continueOnError: true
+      condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/release')
       inputs:
         BuildDropPath: $(Build.ArtifactStagingDirectory)
         DockerImagesToScan: 'clibuild$BUILD_BUILDNUMBER:latest'
@@ -457,8 +454,7 @@ jobs:
 
   - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
     displayName: 'SBOM'
-    condition: eq(variables['Build.Reason'], 'BatchedCI')
-    continueOnError: true
+    condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/release')
     inputs:
       BuildDropPath: $(Build.ArtifactStagingDirectory)
 
@@ -629,8 +625,7 @@ jobs:
 
   - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
     displayName: 'SBOM'
-    condition: eq(variables['Build.Reason'], 'BatchedCI')
-    continueOnError: true
+    condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/release')
     inputs:
       BuildDropPath: $(Build.ArtifactStagingDirectory)
 
@@ -742,8 +737,7 @@ jobs:
 
   - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
     displayName: 'SBOM'
-    condition: eq(variables['Build.Reason'], 'BatchedCI')
-    continueOnError: true
+    condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/release')
     inputs:
       BuildDropPath: $(Build.ArtifactStagingDirectory)
 
@@ -840,8 +834,7 @@ jobs:
       filePath: scripts/release/rpm/pipeline.sh
   - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
     displayName: 'SBOM'
-    condition: eq(variables['Build.Reason'], 'BatchedCI')
-    continueOnError: true
+    condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/release')
     inputs:
       BuildDropPath: $(Build.ArtifactStagingDirectory)
   - task: PublishPipelineArtifact@0
@@ -969,8 +962,7 @@ jobs:
 
   - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
     displayName: 'SBOM'
-    condition: eq(variables['Build.Reason'], 'BatchedCI')
-    continueOnError: true
+    condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/release')
     inputs:
       BuildDropPath: $(Build.ArtifactStagingDirectory)