diff --git a/.azure-pipelines/ci-build.yml b/.azure-pipelines/ci-build.yml
index a300e4f3..bbd00501 100644
--- a/.azure-pipelines/ci-build.yml
+++ b/.azure-pipelines/ci-build.yml
@@ -102,7 +102,7 @@ extends:
               projects: '$(Build.SourcesDirectory)\Microsoft.OpenApi.OData.sln'
               arguments: '--configuration $(BuildConfiguration) --no-build'
 
-          - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@5
+          - task: EsrpCodeSigning@6
             displayName: 'ESRP CodeSigning'
             inputs:
               ConnectedServiceName: 'Federated DevX ESRP Managed Identity Connection'
@@ -164,7 +164,7 @@ extends:
               projects: src/Microsoft.OpenApi.OData.Reader/Microsoft.OpenAPI.OData.Reader.csproj
               arguments: '-o $(Build.ArtifactStagingDirectory) --configuration $(BuildConfiguration) --no-build --include-symbols --include-source /p:SymbolPackageFormat=snupkg'
 
-          - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@5
+          - task: EsrpCodeSigning@6
             displayName: 'ESRP CodeSigning Nuget Packages'
             inputs:
               ConnectedServiceName: 'Federated DevX ESRP Managed Identity Connection'