diff --git a/.azure/pipelines/templates/build.yaml b/.azure/pipelines/templates/build.yaml
index 7a6ba3bce748..044cbf335e54 100644
--- a/.azure/pipelines/templates/build.yaml
+++ b/.azure/pipelines/templates/build.yaml
@@ -134,18 +134,16 @@ jobs:
       inputs:
         SourceFolder: '$(build.sourcesdirectory)'
         Contents: |
-          **/AutoGen*.dll
-          **/Microsoft.AutoGen.*.dll
+          **/bin/**/AutoGen*.dll
+          **/bin/**/Microsoft.AutoGen.*.dll
         TargetFolder: '$(build.artifactstagingdirectory)\codesign'
         CleanTargetFolder: true
     - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@5
-      displayName: 'Codesign: ESRP CodeSigning'
+      displayName: 'Codesign: ESRP CodeSigning (dlls)'
       inputs:
         ConnectedServiceName: 'AI Frontiers ESRP'
         AppRegistrationClientId: 'c1e7a5c0-ee6b-4cec-9e11-4dc3f4670042'
         AppRegistrationTenantId: '975f013f-7f24-47e8-a7d3-abc4752bf346'
-        #EsrpClientId: '7129dd35-ad94-49a9-98c7-eb4cf3cd36a9'
-        #UseMSIAuthentication: true
         AuthAKVName: 'aif-autogen-esrp-kv'
         AuthCertName: 'AIF-PME-InfrastructureAuth'
         AuthSignCertName: 'AutoGenPublishESRPPKI' # this variable is only needed for codesign
@@ -222,12 +220,10 @@ jobs:
         ConnectedServiceName: 'AI Frontiers ESRP'
         AppRegistrationClientId: 'c1e7a5c0-ee6b-4cec-9e11-4dc3f4670042'
         AppRegistrationTenantId: '975f013f-7f24-47e8-a7d3-abc4752bf346'
-        EsrpClientId: '7129dd35-ad94-49a9-98c7-eb4cf3cd36a9'
-        UseMSIAuthentication: true
         AuthAKVName: 'aif-autogen-esrp-kv'
-        #AuthCertName: 'AutoGenPublishESRPPKI'
+        AuthCertName: 'AIF-PME-InfrastructureAuth'
         AuthSignCertName: 'AutoGenPublishESRPPKI' # this variable is only needed for codesign
-        FolderPath: '$(build.sourcesdirectory)/Artifacts/${{parameters.build_configuration}}'
+        FolderPath: '$(build.sourcesdirectory)/dotnet/artifacts/package/${{parameters.build_configuration}}'
         Pattern: '*.nupkg'
         signConfigType: inlineSignParams
         inlineOperation: |