diff --git a/.azure-pipelines/nightly.yml b/.azure-pipelines/nightly.yml
index 4dd6e40..472e9ec 100644
--- a/.azure-pipelines/nightly.yml
+++ b/.azure-pipelines/nightly.yml
@@ -67,10 +67,15 @@ extends:
                   script: |-
                     # Build the jars to the server folder.
                     npm run build-server
-              - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@2
+              - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@5
                 displayName: ESRP CodeSigning
                 inputs:
-                  ConnectedServiceName: vscjavaci_esrp_codesign
+                  ConnectedServiceName: 'ESRP-Release-Test'
+                  AppRegistrationClientId: '1992ee18-e9d2-42d6-ab20-94dd947a44b6'
+                  AppRegistrationTenantId: '72f988bf-86f1-41af-91ab-2d7cd011db47'
+                  AuthAKVName: 'vscjavaci'
+                  AuthCertName: 'vscjava-esrprelease-auth'
+                  AuthSignCertName: 'VSCJava-CodeSign'
                   FolderPath: server
                   Pattern: com.microsoft.jdtls.ext.*.jar
                   signConfigType: inlineSignParams
diff --git a/.azure-pipelines/rc.yml b/.azure-pipelines/rc.yml
index 3745e08..cc8e847 100644
--- a/.azure-pipelines/rc.yml
+++ b/.azure-pipelines/rc.yml
@@ -62,10 +62,15 @@ extends:
                   script: |-
                     # Build the jars to the server folder.
                     npm run build-server
-              - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@2
+              - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@5
                 displayName: ESRP CodeSigning
                 inputs:
-                  ConnectedServiceName: vscjavaci_esrp_codesign
+                  ConnectedServiceName: 'ESRP-Release-Test'
+                  AppRegistrationClientId: '1992ee18-e9d2-42d6-ab20-94dd947a44b6'
+                  AppRegistrationTenantId: '72f988bf-86f1-41af-91ab-2d7cd011db47'
+                  AuthAKVName: 'vscjavaci'
+                  AuthCertName: 'vscjava-esrprelease-auth'
+                  AuthSignCertName: 'VSCJava-CodeSign'
                   FolderPath: server
                   Pattern: com.microsoft.jdtls.ext.*.jar
                   signConfigType: inlineSignParams