diff --git a/azure-pipeline-merge.yml b/azure-pipeline-merge.yml
index 6bd56cb6f3..f8839aae9d 100644
--- a/azure-pipeline-merge.yml
+++ b/azure-pipeline-merge.yml
@@ -28,7 +28,7 @@ extends:
           displayName: "Spell Check"
         - pwsh: |
             cd .\.build
-            .\CodeFormatter.ps1 -Branch $env:TargetBranchName
+            .\CodeFormatter.ps1 -Branch main
           displayName: "Code Formatting Script"
           condition: and(succeeded(), ne(variables['Build.SourceBranch'], 'refs/heads/release'))
           env:
@@ -39,13 +39,13 @@ extends:
           displayName: "Build Script"
         - pwsh: |
             cd .\.build
-            .\Pester.ps1 -NoProgress -Branch $env:TargetBranchName
+            .\Pester.ps1 -NoProgress -Branch main
           displayName: "Running Invoke-Pester"
           env:
             TargetBranchName: $(System.PullRequest.TargetBranch)
         - pwsh: |
             cd .\.build
-            .\ValidateMerge.ps1 -Branch $env:TargetBranchName
+            .\ValidateMerge.ps1 -Branch main
           displayName: "Validate commit times"
           env:
             TargetBranchName: $(System.PullRequest.TargetBranch)
diff --git a/azure-pipeline-release.yml b/azure-pipeline-release.yml
index ce768e4c2e..543c7b14d3 100644
--- a/azure-pipeline-release.yml
+++ b/azure-pipeline-release.yml
@@ -26,47 +26,13 @@ extends:
             cd .\.build
             .\Build.ps1
           displayName: "Build Script"
-        - task: EsrpCodeSigning@2
+        - task: onebranch.pipeline.signing@1
           condition: and(succeeded(), ne (variables['Build.Reason'], 'PullRequest'), eq(variables['Build.SourceBranch'], 'refs/heads/release'))
           inputs:
-            ConnectedServiceName: 'CSS Exchange Code Sign'
-            FolderPath: 'dist'
-            Pattern: '*.ps1'
-            signConfigType: 'inlineSignParams'
-            inlineOperation: |
-              [
-                {
-                  "keyCode": "CP-230012",
-                  "operationSetCode": "SigntoolSign",
-                  "parameters": [
-                    {
-                      "parameterName": "OpusName",
-                      "parameterValue": "CSS Exchange"
-                    },
-                    {
-                      "parameterName": "OpusInfo",
-                      "parameterValue": "https://github.com/microsoft/CSS-Exchange"
-                    },
-                    {
-                      "parameterName": "PageHash",
-                      "parameterValue": "/NPH"
-                    },
-                    {
-                      "parameterName": "FileDigest",
-                      "parameterValue": "/fd sha256"
-                    },
-                    {
-                      "parameterName": "TimeStamp",
-                      "parameterValue": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
-                    }
-                  ],
-                  "toolName": "signtool.exe",
-                  "toolVersion": "6.2.9304.0"
-                }
-              ]
-            SessionTimeout: '60'
-            MaxConcurrency: '50'
-            MaxRetryAttempts: '5'
+            command: 'sign'
+            signing_profile: 'external_distribution'
+            files_to_sign: '*.ps1'
+            search_root: 'dist'
         - pwsh: |
             cd .\.build
             .\BuildScriptVersions.ps1