diff --git a/tools/ci_build/github/azure-pipelines/nuget-windows-ai.yml b/tools/ci_build/github/azure-pipelines/nuget-windows-ai.yml
index c6ab33164035c..753395151b620 100644
--- a/tools/ci_build/github/azure-pipelines/nuget-windows-ai.yml
+++ b/tools/ci_build/github/azure-pipelines/nuget-windows-ai.yml
@@ -260,12 +260,12 @@ extends:
           displayName: "Sign Nuget package"
           inputs:
             ConnectedServiceName: 'OnnxrunTimeCodeSign_20240611'
-            AppRegistrationClientId: '53d54d02-978d-4305-8572-583cf6711c4f'
-            AppRegistrationTenantId: '72f988bf-86f1-41af-91ab-2d7cd011db47'
-            AuthAKVName: 'buildkeyvault'
-            AuthCertName: '53d54d02-SSL-AutoRotate'
-            AuthSignCertName: '53d54d02-978d-4305-8572-583cf6711c4f'
-
+            UseMSIAuthentication: true
+            AppRegistrationClientId: '62b7cfed-4d25-454f-880e-010dc21455ac'
+            AppRegistrationTenantId: '975f013f-7f24-47e8-a7d3-abc4752bf346'
+            EsrpClientId: "53d54d02-978d-4305-8572-583cf6711c4f"
+            AuthAKVName: 'ortbuildkeyvault'
+            AuthSignCertName: 'esrpcodesign'
             FolderPath: $(Build.ArtifactStagingDirectory)
             Pattern: '*.nupkg'
             SessionTimeout: 90
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 79cceb7a02511..ffec479474721 100644
--- a/tools/ci_build/github/azure-pipelines/templates/esrp_nuget.yml
+++ b/tools/ci_build/github/azure-pipelines/templates/esrp_nuget.yml
@@ -9,12 +9,12 @@ steps:
     displayName: 'ESRP CodeSigning'
     inputs:
       ConnectedServiceName: 'OnnxrunTimeCodeSign_20240611'
-      AppRegistrationClientId: '53d54d02-978d-4305-8572-583cf6711c4f'
-      AppRegistrationTenantId: '72f988bf-86f1-41af-91ab-2d7cd011db47'
-      AuthAKVName: 'buildkeyvault'
-      AuthCertName: '53d54d02-SSL-AutoRotate'
-      AuthSignCertName: '53d54d02-978d-4305-8572-583cf6711c4f'
-
+      UseMSIAuthentication: true
+      AppRegistrationClientId: '62b7cfed-4d25-454f-880e-010dc21455ac'
+      AppRegistrationTenantId: '975f013f-7f24-47e8-a7d3-abc4752bf346'
+      EsrpClientId: "53d54d02-978d-4305-8572-583cf6711c4f"
+      AuthAKVName: 'ortbuildkeyvault'
+      AuthSignCertName: 'esrpcodesign'
       FolderPath: ${{ parameters.FolderPath }}
       Pattern: '*.nupkg'
       SessionTimeout: 90
diff --git a/tools/ci_build/github/azure-pipelines/templates/jar-maven-signing-linux.yml b/tools/ci_build/github/azure-pipelines/templates/jar-maven-signing-linux.yml
index d14952e544e5e..df2aff0634819 100644
--- a/tools/ci_build/github/azure-pipelines/templates/jar-maven-signing-linux.yml
+++ b/tools/ci_build/github/azure-pipelines/templates/jar-maven-signing-linux.yml
@@ -7,7 +7,7 @@ steps:
     displayName: 'Get GnuPG signing keys'
     inputs:
       #The value below is the name of an ADO service connection.
-      azureSubscription: 'OnnxrunTimeCodeSign_20240611'
+      azureSubscription: 'AIInfraBuildOnnxRuntimeOSS'
       KeyVaultName: 'ort-release'
       SecretsFilter: 'java-pgp-pwd,java-pgp-key'
       RunAsPreJob: false
diff --git a/tools/ci_build/github/azure-pipelines/templates/jar-maven-signing-win.yml b/tools/ci_build/github/azure-pipelines/templates/jar-maven-signing-win.yml
index 5681b3568bae1..ef845dc3bf243 100644
--- a/tools/ci_build/github/azure-pipelines/templates/jar-maven-signing-win.yml
+++ b/tools/ci_build/github/azure-pipelines/templates/jar-maven-signing-win.yml
@@ -6,7 +6,7 @@ steps:
   - task: AzureKeyVault@2
     displayName: 'Get GnuPG signing keys'
     inputs:
-      azureSubscription: 'OnnxrunTimeCodeSign_20240611'
+      azureSubscription: 'AIInfraBuildOnnxRuntimeOSS'
       KeyVaultName: 'ort-release'
       SecretsFilter: 'java-pgp-pwd,java-pgp-key'
       RunAsPreJob: false
diff --git a/tools/ci_build/github/azure-pipelines/templates/mac-esrp-dylib.yml b/tools/ci_build/github/azure-pipelines/templates/mac-esrp-dylib.yml
index aeebf2a39c8e0..856f9a02bb13f 100644
--- a/tools/ci_build/github/azure-pipelines/templates/mac-esrp-dylib.yml
+++ b/tools/ci_build/github/azure-pipelines/templates/mac-esrp-dylib.yml
@@ -20,12 +20,12 @@ steps:
   displayName: 'ESRP CodeSigning'
   inputs:
     ConnectedServiceName: 'OnnxrunTimeCodeSign_20240611'
-    AppRegistrationClientId: '53d54d02-978d-4305-8572-583cf6711c4f'
-    AppRegistrationTenantId: '72f988bf-86f1-41af-91ab-2d7cd011db47'
-    AuthAKVName: 'buildkeyvault'
-    AuthCertName: '53d54d02-SSL-AutoRotate'
-    AuthSignCertName: '53d54d02-978d-4305-8572-583cf6711c4f'
-
+    UseMSIAuthentication: true
+    AppRegistrationClientId: '62b7cfed-4d25-454f-880e-010dc21455ac'
+    AppRegistrationTenantId: '975f013f-7f24-47e8-a7d3-abc4752bf346'
+    EsrpClientId: "53d54d02-978d-4305-8572-583cf6711c4f"
+    AuthAKVName: 'ortbuildkeyvault'
+    AuthSignCertName: 'esrpcodesign'
     FolderPath: ${{ parameters.FolderPath }}
     Pattern: '*.nupkg'
     SessionTimeout: 90
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 86acebc9f7a71..0476bc74349bf 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
@@ -21,11 +21,12 @@ steps:
   condition: and(succeeded(), eq('${{ parameters.DoEsrp }}', true))
   inputs:
     ConnectedServiceName: 'OnnxrunTimeCodeSign_20240611'
-    AppRegistrationClientId: '53d54d02-978d-4305-8572-583cf6711c4f'
-    AppRegistrationTenantId: '72f988bf-86f1-41af-91ab-2d7cd011db47'
-    AuthAKVName: 'buildkeyvault'
-    AuthCertName: '53d54d02-SSL-AutoRotate'
-    AuthSignCertName: '53d54d02-978d-4305-8572-583cf6711c4f'
+    UseMSIAuthentication: true
+    AppRegistrationClientId: '62b7cfed-4d25-454f-880e-010dc21455ac'
+    AppRegistrationTenantId: '975f013f-7f24-47e8-a7d3-abc4752bf346'
+    EsrpClientId: "53d54d02-978d-4305-8572-583cf6711c4f"
+    AuthAKVName: 'ortbuildkeyvault'
+    AuthSignCertName: 'esrpcodesign'
     signConfigType: inlineSignParams
     inlineOperation: |
       [