diff --git a/.pipelines/OneBranch.Buddy.yml b/.pipelines/OneBranch.Buddy.yml
index 6f75353..5acc7cb 100644
--- a/.pipelines/OneBranch.Buddy.yml
+++ b/.pipelines/OneBranch.Buddy.yml
@@ -1,5 +1,5 @@
 #################################################################################
-#   Onebranch Pipelines - Buddy MSBuild (CDPXMigrated)                          #
+#   Onebranch Pipelines - Official MSBuild (CDPXMigrated)                       #
 # This pipeline was created by EasyStart from a sample located at:              #
 #   https://aka.ms/obpipelines/easystart/samples                                #
 # Documentation:  https://aka.ms/obpipelines                                    #
@@ -24,10 +24,10 @@ variables:
   REPOROOT: $(Build.SourcesDirectory)
   OUTPUTROOT: $(REPOROOT)\out
   NUGET_XMLDOC_MODE: skip
-  ${{ if eq(variables['Build.DefinitionName'], 'powerbi-client-react-Official') }}:
-    obpTemplate: v2/OneBranch.Official.CrossPlat.yml@templates # https://aka.ms/obpipelines/templates
-  ${{ else }}:
+  ${{ if eq(variables['Build.DefinitionName'], 'powerbi-client-react-Buddy') }}:
     obpTemplate: v2/OneBranch.NonOfficial.CrossPlat.yml@templates # https://aka.ms/obpipelines/templates
+  ${{ else }}:
+    obpTemplate: v2/OneBranch.Official.CrossPlat.yml@templates # https://aka.ms/obpipelines/templates
 
   WindowsContainerImage: 'cdpxwin1809.azurecr.io/global/obinfra/windows/1809/vs2019:latest' # Docker image which is used to build the project https://aka.ms/obpipelines/containers
 
@@ -41,9 +41,15 @@ resources:
 extends:
   template: ${{ variables.obpTemplate }}
   parameters:
+    cloudvault: # https://aka.ms/obpipelines/cloudvault
+      enabled: false
     globalSdl: # https://aka.ms/obpipelines/sdl
       tsa:
-        enabled: false # onebranch publish all sdl results to TSA. If TSA is disabled all SDL tools will forced into 'break' build mode.
+        enabled: false
+      binskim:
+        break: true
+      policheck:
+        break: true
       cg:
         failOnAlert: false
 
@@ -54,9 +60,11 @@ extends:
         pool:
           type: windows  # read more about custom job pool types at https://aka.ms/obpipelines/yaml/jobs
 
-        variables: # More settings at https://aka.ms/obpipelines/yaml/jobs
+        variables:
           ob_outputDirectory: '$(OUTPUTROOT)' # this directory is uploaded to pipeline artifacts, reddog and cloudvault. More info at https://aka.ms/obpipelines/artifacts
           ob_sdl_binskim_break: true # https://aka.ms/obpipelines/sdl
+          ${{ if eq(variables['Build.SourceBranch'], 'refs/heads/master') }}: # conditionally enable symbolsPublishing for master branch only
+            ob_symbolsPublishing_enabled: true # https://aka.ms/obpipelines/symbols
           ob_artifactBaseName: 'drop'
           ob_sdl_cg_failOnAlert: false