diff --git a/build/azure-pipelines/darwin/sql-product-build-darwin-signing.yml b/build/azure-pipelines/darwin/sql-product-build-darwin-signing.yml
index 91957dc0124b..1ccaf4d62ce1 100644
--- a/build/azure-pipelines/darwin/sql-product-build-darwin-signing.yml
+++ b/build/azure-pipelines/darwin/sql-product-build-darwin-signing.yml
@@ -17,14 +17,7 @@ steps:
       mv azuredatastudio-darwin-$(VSCODE_ARCH)-unsigned.zip azuredatastudio-darwin-$(VSCODE_ARCH).zip
     displayName: 'Rename the file'
 
-  - task: UseDotNet@2
-    displayName: 'Install .NET Core sdk for signing'
-    inputs:
-      packageType: sdk
-      version: 2.1.x
-      installationPath: $(Agent.ToolsDirectory)/dotnet
-
-  - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
+  - task: EsrpCodeSigning@3
     displayName: 'ESRP CodeSigning'
     inputs:
       ConnectedServiceName: 'Code Signing'
@@ -51,7 +44,7 @@ steps:
     displayName: Clean Archive
     condition: and(succeeded(), eq(variables['signed'], true))
 
-  - task: EsrpCodeSigning@1
+  - task: EsrpCodeSigning@3
     displayName: 'ESRP Notarization'
     inputs:
       ConnectedServiceName: 'Code Signing'
diff --git a/build/azure-pipelines/linux/sql-product-build-linux.yml b/build/azure-pipelines/linux/sql-product-build-linux.yml
index ed06918639f9..68d57351dc70 100644
--- a/build/azure-pipelines/linux/sql-product-build-linux.yml
+++ b/build/azure-pipelines/linux/sql-product-build-linux.yml
@@ -208,13 +208,13 @@ steps:
     condition: and(succeeded(), ne(variables['EXTENSIONS_ONLY'], 'true'))
 
   - task: UseDotNet@2
-    displayName: 'Install .NET Core sdk for signing'
+    displayName: 'Install .NET SDK for signing'
     inputs:
       packageType: sdk
-      version: 5.0.x
+      version: 6.0.x
       installationPath: $(Agent.ToolsDirectory)/dotnet
 
-  - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
+  - task: EsrpCodeSigning@3
     inputs:
       ConnectedServiceName: 'Code Signing'
       FolderPath: '$(Build.SourcesDirectory)/.build'
diff --git a/build/azure-pipelines/web/sql-product-build-web.yml b/build/azure-pipelines/web/sql-product-build-web.yml
index 7789f04014d6..c5baa0aede3d 100644
--- a/build/azure-pipelines/web/sql-product-build-web.yml
+++ b/build/azure-pipelines/web/sql-product-build-web.yml
@@ -181,13 +181,13 @@ steps:
   displayName: Build Rpm
 
 - task: UseDotNet@2
-  displayName: 'Install .NET Core sdk for signing'
+  displayName: 'Install .NET SDK for signing'
   inputs:
     packageType: sdk
-    version: 5.0.x
+    version: 6.0.x
     installationPath: $(Agent.ToolsDirectory)/dotnet
 
-- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
+- task: EsrpCodeSigning@3
   inputs:
     ConnectedServiceName: 'Code Signing'
     FolderPath: '$(Build.SourcesDirectory)/.build'
diff --git a/build/azure-pipelines/win32/sql-product-build-win32.yml b/build/azure-pipelines/win32/sql-product-build-win32.yml
index a3c12439b28e..2d5a9888154c 100644
--- a/build/azure-pipelines/win32/sql-product-build-win32.yml
+++ b/build/azure-pipelines/win32/sql-product-build-win32.yml
@@ -173,7 +173,7 @@ steps:
     displayName: Run core integration tests (arm64)
     condition: and(succeeded(), and(eq(variables['RUN_TESTS'], 'true'), eq(variables['VSCODE_ARCH'], 'arm64')))
 
-  - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
+  - task: EsrpCodeSigning@3
     displayName: 'Sign out code'
     inputs:
       ConnectedServiceName: 'Code Signing'
@@ -236,7 +236,7 @@ steps:
       exec { yarn gulp "vscode-win32-$(VSCODE_ARCH)-archive" }
     displayName: Archive & User & System setup
 
-  - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
+  - task: EsrpCodeSigning@3
     displayName: 'Sign installers'
     inputs:
       ConnectedServiceName: 'Code Signing'