diff --git a/tools/ci_build/github/azure-pipelines/templates/esrp_nuget.yml b/tools/ci_build/github/azure-pipelines/templates/esrp_nuget.yml
index 0e6c6daab5c8a..b699f2c7f1da3 100644
--- a/tools/ci_build/github/azure-pipelines/templates/esrp_nuget.yml
+++ b/tools/ci_build/github/azure-pipelines/templates/esrp_nuget.yml
@@ -5,7 +5,7 @@ parameters:
 
 steps:
 - ${{ if eq(parameters['DoEsrp'], 'true') }}:
-  - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
+  - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@2
     displayName: ${{ parameters.DisplayName }}
     inputs:
       ConnectedServiceName: 'OnnxRuntime CodeSign 20190817'
@@ -13,7 +13,7 @@ steps:
       Pattern: '*.nupkg'
       signConfigType: inlineSignParams
       inlineOperation: |
-       [ 
+       [
            {
                "keyCode": "CP-401405",
                "operationSetCode": "NuGetSign",
diff --git a/tools/ci_build/github/azure-pipelines/templates/mac-esrp-dll.yml b/tools/ci_build/github/azure-pipelines/templates/mac-esrp-dll.yml
index 36941231db1c6..008ab59e9163e 100644
--- a/tools/ci_build/github/azure-pipelines/templates/mac-esrp-dll.yml
+++ b/tools/ci_build/github/azure-pipelines/templates/mac-esrp-dll.yml
@@ -5,7 +5,7 @@ parameters:
   Pattern: '*.dll'
 
 steps:
-- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
+- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@2
   displayName: ${{ parameters.DisplayName }}
   inputs:
     ConnectedServiceName: 'OnnxRuntime CodeSign 20190817'
diff --git a/tools/ci_build/github/azure-pipelines/templates/win-esrp-dll.yml b/tools/ci_build/github/azure-pipelines/templates/win-esrp-dll.yml
index a51eb3f6a0b92..ba4c55f2fde4d 100644
--- a/tools/ci_build/github/azure-pipelines/templates/win-esrp-dll.yml
+++ b/tools/ci_build/github/azure-pipelines/templates/win-esrp-dll.yml
@@ -16,7 +16,7 @@ parameters:
   default: '*.dll'
 
 steps:
-- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
+- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@2
   displayName: ${{ parameters.DisplayName }}
   condition: and(succeeded(), eq('${{ parameters.DoEsrp }}', true))
   inputs: