diff --git a/build/azure-pipelines/build-product.yml b/build/azure-pipelines/build-product.yml
index 2aded7a8..98dcbf50 100644
--- a/build/azure-pipelines/build-product.yml
+++ b/build/azure-pipelines/build-product.yml
@@ -80,46 +80,39 @@ stages:
         inputs:
           buildType: 'current'
           targetPath: '$(Pipeline.Workspace)'
-      - task: UseDotNet@2
-        inputs:
-          packageType: 'sdk'
-          version: '2.1.x'      
-      - task: EsrpCodeSigning@1
+      - task: EsrpCodeSigning@2
         displayName: Sign Windows binary
         inputs:
           ConnectedServiceName: 'Code Signing'
           FolderPath: '$(Pipeline.Workspace)'
           Pattern: 'sqlcmd.exe'
           signConfigType: 'inlineSignParams'
-          SessionTimeout: '600'
-          MaxConcurrency: '5'
-          MaxRetryAttempts: '5'
           inlineOperation: |
             [
               {
                 "keyCode": "CP-230012",
                 "operationSetCode": "SigntoolSign",
                 "parameters": [
-                {
-                  "parameterName": "OpusName",
-                  "parameterValue": "go-sqlcmd"
-                },
-                {
-                  "parameterName": "OpusInfo",
-                  "parameterValue": "https://github.com/microsoft/go-sqlcmd"
-                },
-                {
-                  "parameterName": "PageHash",
-                  "parameterValue": "/NPH"
-                },
-                {
-                  "parameterName": "FileDigest",
-                  "parameterValue": "/fd sha256"
-                },
-                {
-                  "parameterName": "TimeStamp",
-                  "parameterValue": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
-                }
+                  {
+                    "parameterName": "OpusName",
+                    "parameterValue": "go-sqlcmd"
+                  },
+                  {
+                    "parameterName": "OpusInfo",
+                    "parameterValue": "https://github.com/microsoft/go-sqlcmd"
+                  },
+                  {
+                    "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"
@@ -137,6 +130,9 @@ stages:
                 "toolVersion": "6.2.9304.0"
               }
             ]
+          SessionTimeout: '60'
+          MaxConcurrency: '50'
+          MaxRetryAttempts: '5'
       - task: ArchiveFiles@2
         displayName: Zip Windows amd64 binary
         inputs: