diff --git a/build/releaseBuild.yml b/build/releaseBuild.yml
index a207ea856d..afffd77cbd 100644
--- a/build/releaseBuild.yml
+++ b/build/releaseBuild.yml
@@ -157,7 +157,7 @@ jobs:
       filePath: ./pack.ps1
       arguments: '-buildType $(BuildConfiguration) C:\hostedtoolcache\windows\dotnet'
 
-  - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
+  - task: EsrpCodeSigning@4
     displayName: 'Sign Nuget Packages'
     inputs:
       ConnectedServiceName: 'IDDP Code Signing'
diff --git a/build/template-sign-binary.yml b/build/template-sign-binary.yml
index 6212927159..9f30d93c6b 100644
--- a/build/template-sign-binary.yml
+++ b/build/template-sign-binary.yml
@@ -6,11 +6,11 @@ parameters:
   BuildConfiguration: ''
 
 steps:
-- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
+- task: EsrpCodeSigning@4
   displayName: 'Sign ${{ parameters.LibraryName }}'
   inputs:
     ConnectedServiceName: 'IDDP Code Signing'
-    FolderPath: 'src\${{ parameters.LibraryName }}\bin\${{ parameters.BuildConfiguration }}'
+    FolderPath: '$(Build.SourcesDirectory)\src'
     Pattern: ${{ parameters.LibraryName }}.dll
     signConfigType: inlineSignParams
     inlineOperation: |
diff --git a/build/template-sign-wilson-7x.yaml b/build/template-sign-wilson-7x.yaml
index ade43ec102..5dd5d298c6 100644
--- a/build/template-sign-wilson-7x.yaml
+++ b/build/template-sign-wilson-7x.yaml
@@ -11,77 +11,7 @@ steps:
 
 - template: template-sign-binary.yml
   parameters:
-    LibraryName: 'Microsoft.IdentityModel.JsonWebTokens'
-    BuildConfiguration: ${{ parameters.BuildConfiguration }}
-
-- template: template-sign-binary.yml
-  parameters:
-    LibraryName: 'Microsoft.IdentityModel.Logging'
-    BuildConfiguration: ${{ parameters.BuildConfiguration }}
-
-- template: template-sign-binary.yml
-  parameters:
-    LibraryName: 'Microsoft.IdentityModel.Protocols'
-    BuildConfiguration: ${{ parameters.BuildConfiguration }}
-
-- template: template-sign-binary.yml
-  parameters:
-    LibraryName: 'Microsoft.IdentityModel.Protocols.WsFederation'
-    BuildConfiguration: ${{ parameters.BuildConfiguration }}
-
-- template: template-sign-binary.yml
-  parameters:
-    LibraryName: 'Microsoft.IdentityModel.Tokens'
-    BuildConfiguration: ${{ parameters.BuildConfiguration }}
-
-- template: template-sign-binary.yml
-  parameters:
-    LibraryName: 'Microsoft.IdentityModel.Tokens.Saml'
-    BuildConfiguration: ${{ parameters.BuildConfiguration }}
-
-- template: template-sign-binary.yml
-  parameters:
-    LibraryName: 'Microsoft.IdentityModel.Xml'
-    BuildConfiguration: ${{ parameters.BuildConfiguration }}
-
-- template: template-sign-binary.yml
-  parameters:
-    LibraryName: 'Microsoft.IdentityModel.Protocols.OpenIdConnect'
-    BuildConfiguration: ${{ parameters.BuildConfiguration }}
-
-- template: template-sign-binary.yml
-  parameters:
-    LibraryName: 'Microsoft.IdentityModel.Protocols.SignedHttpRequest'
-    BuildConfiguration: ${{ parameters.BuildConfiguration }}
-
-- template: template-sign-binary.yml
-  parameters:
-    LibraryName: 'Microsoft.IdentityModel.KeyVaultExtensions'
-    BuildConfiguration: ${{ parameters.BuildConfiguration }}
-
-- template: template-sign-binary.yml
-  parameters:
-    LibraryName: 'Microsoft.IdentityModel.ManagedKeyVaultSecurityKey'
-    BuildConfiguration: ${{ parameters.BuildConfiguration }}
-
-- template: template-sign-binary.yml
-  parameters:
-    LibraryName: 'Microsoft.IdentityModel.Validators'
-    BuildConfiguration: ${{ parameters.BuildConfiguration }}
-
-- template: template-sign-binary.yml
-  parameters:
-    LibraryName: 'Microsoft.IdentityModel.Abstractions'
-    BuildConfiguration: ${{ parameters.BuildConfiguration }}
-
-- template: template-sign-binary.yml
-  parameters:
-    LibraryName: 'Microsoft.IdentityModel.LoggingExtensions'
-    BuildConfiguration: ${{ parameters.BuildConfiguration }}
-
-- template: template-sign-binary.yml
-  parameters:
-    LibraryName: 'Microsoft.IdentityModel.TestExtensions'
+    LibraryName: 'Microsoft.IdentityModel*'
     BuildConfiguration: ${{ parameters.BuildConfiguration }}
 
 - task: PowerShell@1