diff --git a/eng/pipelines/templates/jobs/ci.tests.yml b/eng/pipelines/templates/jobs/ci.tests.yml
index 291083e0c..80f3dcf80 100644
--- a/eng/pipelines/templates/jobs/ci.tests.yml
+++ b/eng/pipelines/templates/jobs/ci.tests.yml
@@ -202,9 +202,10 @@ jobs:
           condition: and(succeededOrFailed(), eq(variables['CODE_COVERAGE'], 'enabled'), eq(variables['Skip.BranchCoverageEnforcement'], ''))
 
       # Use the job name to create the artifact name for MAP file publishing.
-      # "Validate Windows2019_UWP_debug_x86" -> "Windows2019_UWP_debug_x86"
+      # Attempts are also noted starting with 1
+      # "Validate Windows2019_UWP_debug_x86" -> "Windows2019_UWP_debug_x86_attempt_1"
       - pwsh: |
-          $artifactName = '$(Agent.JobName)'
+          $artifactName = "$(Agent.JobName)_attempt_$(System.JobAttempt)"
           $parts = $artifactName -split ' '
           if ($parts[1]) {
             $artifactName = $parts[1]
@@ -219,9 +220,11 @@ jobs:
           targetFolder: $(Build.ArtifactStagingDirectory)
           flattenFolders: true
         condition: eq(variables['PublishMapFiles'], 'true')
+        displayName: Stage map files
 
       - task: PublishPipelineArtifact@1
         inputs:
           artifactName: map-files-$(MapFileArtifactName)
           path: $(Build.ArtifactStagingDirectory)
-        condition: eq(variables['PublishMapFiles'], 'true')
\ No newline at end of file
+        condition: eq(variables['PublishMapFiles'], 'true')
+        displayName : Publish map file artifacts
\ No newline at end of file