diff --git a/.azure-pipelines/release.yml b/.azure-pipelines/release.yml
index 5e7d153ff6ab8c..07d274c4933f34 100644
--- a/.azure-pipelines/release.yml
+++ b/.azure-pipelines/release.yml
@@ -151,6 +151,18 @@ extends:
                       echo "##vso[task.setvariable variable=tag_name;isOutput=true;isReadOnly=true]untagged"
                       echo "##vso[task.setvariable variable=tag_sha;isOutput=true;isReadOnly=true]${tag_sha}"
                       echo "##vso[build.updatebuildnumber][UNTAGGED] ${tag_sha} (${BUILD_BUILDNUMBER:-unknown})"
+              - ${{ if eq(parameters.esrp, true) }}:
+                - task: AzureCLI@2
+                  displayName: 'Prepare ESRP connection'
+                  inputs:
+                    azureSubscription: ${{ parameters.serviceConnectionName }}
+                    addSpnToEnvironment: true
+                    scriptType: ps
+                    scriptLocation: inlineScript
+                    inlineScript: |
+                      Write-Host "ESRP connection details:"
+                      Write-Host "ClientId: $env:servicePrincipalId"
+                      Write-Host "TenantId: $env:tenantId"
 
       - stage: build
         displayName: 'Build'