diff --git a/.azure/pipelines/ci-public.yml b/.azure/pipelines/ci-public.yml
index eb9ffeaa3cd5..730efedf620d 100644
--- a/.azure/pipelines/ci-public.yml
+++ b/.azure/pipelines/ci-public.yml
@@ -93,7 +93,7 @@ stages:
       - powershell: ./eng/scripts/CodeCheck.ps1 -ci $(_InternalRuntimeDownloadArgs)
         displayName: Run eng/scripts/CodeCheck.ps1
       artifacts:
-      - name: Code_Check_Logs
+      - name: Code_Check_Logs_Attempt_$(System.JobAttempt)
         path: artifacts/log/
         publishOnError: true
         includeForks: true
@@ -213,7 +213,7 @@ stages:
         displayName: Build ARM64 Installers
 
       artifacts:
-      - name: Windows_Logs
+      - name: Windows_Logs_Attempt_$(System.JobAttempt)
         path: artifacts/log/
         publishOnError: true
         includeForks: true
@@ -246,7 +246,7 @@ stages:
         $(_InternalRuntimeDownloadArgs)
       installNodeJs: false
       artifacts:
-      - name: MacOS_arm64_Logs
+      - name: MacOS_arm64_Logs_Attempt_$(System.JobAttempt)
         path: artifacts/log/
         publishOnError: true
         includeForks: true
@@ -277,7 +277,7 @@ stages:
         $(_InternalRuntimeDownloadArgs)
       installNodeJs: false
       artifacts:
-      - name: MacOS_x64_Logs
+      - name: MacOS_x64_Logs_Attempt_$(System.JobAttempt)
         path: artifacts/log/
         publishOnError: true
         includeForks: true
@@ -324,7 +324,7 @@ stages:
         displayName: Build RPM installers
       installNodeJs: false
       artifacts:
-      - name: Linux_x64_Logs
+      - name: Linux_x64_Logs_Attempt_$(System.JobAttempt)
         path: artifacts/log/
         publishOnError: true
         includeForks: true
@@ -355,7 +355,7 @@ stages:
         $(_InternalRuntimeDownloadArgs)
       installNodeJs: false
       artifacts:
-      - name: Linux_arm_Logs
+      - name: Linux_arm_Logs_Attempt_$(System.JobAttempt)
         path: artifacts/log/
         publishOnError: true
         includeForks: true
@@ -395,7 +395,7 @@ stages:
         displayName: Build RPM installers
       installNodeJs: false
       artifacts:
-      - name: Linux_arm64_Logs
+      - name: Linux_arm64_Logs_Attempt_$(System.JobAttempt)
         path: artifacts/log/
         publishOnError: true
         includeForks: true
@@ -429,7 +429,7 @@ stages:
       installNodeJs: false
       disableComponentGovernance: true
       artifacts:
-      - name: Linux_musl_x64_Logs
+      - name: Linux_musl_x64_Logs_Attempt_$(System.JobAttempt)
         path: artifacts/log/
         publishOnError: true
         includeForks: true
@@ -463,7 +463,7 @@ stages:
         $(_InternalRuntimeDownloadArgs)
       installNodeJs: false
       artifacts:
-      - name: Linux_musl_arm_Logs
+      - name: Linux_musl_arm_Logs_Attempt_$(System.JobAttempt)
         path: artifacts/log/
         publishOnError: true
         includeForks: true
@@ -497,7 +497,7 @@ stages:
         $(_InternalRuntimeDownloadArgs)
       installNodeJs: false
       artifacts:
-      - name: Linux_musl_arm64_Logs
+      - name: Linux_musl_arm64_Logs_Attempt_$(System.JobAttempt)
         path: artifacts/log/
         publishOnError: true
         includeForks: true
@@ -526,11 +526,11 @@ stages:
         - powershell: "& ./src/Servers/IIS/tools/UpdateIISExpressCertificate.ps1; & ./src/Servers/IIS/tools/update_schema.ps1"
           displayName: Setup IISExpress test certificates and schema
         artifacts:
-        - name: Windows_Test_Logs
+        - name: Windows_Test_Logs_Attempt_$(System.JobAttempt)
           path: artifacts/log/
           publishOnError: true
           includeForks: true
-        - name: Windows_Test_Results
+        - name: Windows_Test_Results_Attempt_$(System.JobAttempt)
           path: artifacts/TestResults/
           publishOnError: true
           includeForks: true
@@ -547,11 +547,11 @@ stages:
         - bash: "./eng/scripts/install-nginx-mac.sh"
           displayName: Installing Nginx
         artifacts:
-        - name: MacOS_Test_Logs
+        - name: MacOS_Test_Logs_Attempt_$(System.JobAttempt)
           path: artifacts/log/
           publishOnError: true
           includeForks: true
-        - name: MacOS_Test_Results
+        - name: MacOS_Test_Results_Attempt_$(System.JobAttempt)
           path: artifacts/TestResults/
           publishOnError: true
           includeForks: true
@@ -570,11 +570,11 @@ stages:
         - bash: "echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p"
           displayName: Increase inotify limit
         artifacts:
-        - name: Linux_Test_Logs
+        - name: Linux_Test_Logs_Attempt_$(System.JobAttempt)
           path: artifacts/log/
           publishOnError: true
           includeForks: true
-        - name: Linux_Test_Results
+        - name: Linux_Test_Results_Attempt_$(System.JobAttempt)
           path: artifacts/TestResults/
           publishOnError: true
           includeForks: true
@@ -601,7 +601,7 @@ stages:
             SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops
 
         artifacts:
-        - name: Helix_logs
+        - name: Helix_Logs_Attempt_$(System.JobAttempt)
           path: artifacts/log/
           publishOnError: true
           includeForks: true
diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml
index 80db7eea0830..0395418fe330 100644
--- a/.azure/pipelines/ci.yml
+++ b/.azure/pipelines/ci.yml
@@ -160,7 +160,7 @@ extends:
             - powershell: ./eng/scripts/CodeCheck.ps1 -ci $(_InternalRuntimeDownloadArgs)
               displayName: Run eng/scripts/CodeCheck.ps1
             artifacts:
-            - name: Code_Check_Logs
+            - name: Code_Check_Logs_Attempt_$(System.JobAttempt)
               path: artifacts/log/
               publishOnError: true
               includeForks: true
@@ -280,7 +280,7 @@ extends:
             displayName: Build ARM64 Installers
 
           artifacts:
-          - name: Windows_Logs
+          - name: Windows_Logs_Attempt_$(System.JobAttempt)
             path: artifacts/log/
             publishOnError: true
             includeForks: true
@@ -312,7 +312,7 @@ extends:
             $(_InternalRuntimeDownloadArgs)
           installNodeJs: false
           artifacts:
-          - name: MacOS_arm64_Logs
+          - name: MacOS_arm64_Logs_Attempt_$(System.JobAttempt)
             path: artifacts/log/
             publishOnError: true
             includeForks: true
@@ -342,7 +342,7 @@ extends:
             $(_InternalRuntimeDownloadArgs)
           installNodeJs: false
           artifacts:
-          - name: MacOS_x64_Logs
+          - name: MacOS_x64_Logs_Attempt_$(System.JobAttempt)
             path: artifacts/log/
             publishOnError: true
             includeForks: true
@@ -389,7 +389,7 @@ extends:
             displayName: Build RPM installers
           installNodeJs: false
           artifacts:
-          - name: Linux_x64_Logs
+          - name: Linux_x64_Logs_Attempt_$(System.JobAttempt)
             path: artifacts/log/
             publishOnError: true
             includeForks: true
@@ -420,7 +420,7 @@ extends:
             $(_InternalRuntimeDownloadArgs)
           installNodeJs: false
           artifacts:
-          - name: Linux_arm_Logs
+          - name: Linux_arm_Logs_Attempt_$(System.JobAttempt)
             path: artifacts/log/
             publishOnError: true
             includeForks: true
@@ -460,7 +460,7 @@ extends:
             displayName: Build RPM installers
           installNodeJs: false
           artifacts:
-          - name: Linux_arm64_Logs
+          - name: Linux_arm64_Logs_Attempt_$(System.JobAttempt)
             path: artifacts/log/
             publishOnError: true
             includeForks: true
@@ -494,7 +494,7 @@ extends:
           installNodeJs: false
           disableComponentGovernance: true
           artifacts:
-          - name: Linux_musl_x64_Logs
+          - name: Linux_musl_x64_Logs_Attempt_$(System.JobAttempt)
             path: artifacts/log/
             publishOnError: true
             includeForks: true
@@ -528,7 +528,7 @@ extends:
             $(_InternalRuntimeDownloadArgs)
           installNodeJs: false
           artifacts:
-          - name: Linux_musl_arm_Logs
+          - name: Linux_musl_arm_Logs_Attempt_$(System.JobAttempt)
             path: artifacts/log/
             publishOnError: true
             includeForks: true
@@ -562,7 +562,7 @@ extends:
             $(_InternalRuntimeDownloadArgs)
           installNodeJs: false
           artifacts:
-          - name: Linux_musl_arm64_Logs
+          - name: Linux_musl_arm64_Logs_Attempt_$(System.JobAttempt)
             path: artifacts/log/
             publishOnError: true
             includeForks: true
@@ -591,11 +591,11 @@ extends:
             - powershell: "& ./src/Servers/IIS/tools/UpdateIISExpressCertificate.ps1; & ./src/Servers/IIS/tools/update_schema.ps1"
               displayName: Setup IISExpress test certificates and schema
             artifacts:
-            - name: Windows_Test_Logs
+            - name: Windows_Test_Logs_Attempt_$(System.JobAttempt)
               path: artifacts/log/
               publishOnError: true
               includeForks: true
-            - name: Windows_Test_Results
+            - name: Windows_Test_Results_Attempt_$(System.JobAttempt)
               path: artifacts/TestResults/
               publishOnError: true
               includeForks: true
@@ -612,11 +612,11 @@ extends:
             - bash: "./eng/scripts/install-nginx-mac.sh"
               displayName: Installing Nginx
             artifacts:
-            - name: MacOS_Test_Logs
+            - name: MacOS_Test_Logs_Attempt_$(System.JobAttempt)
               path: artifacts/log/
               publishOnError: true
               includeForks: true
-            - name: MacOS_Test_Results
+            - name: MacOS_Test_Results_Attempt_$(System.JobAttempt)
               path: artifacts/TestResults/
               publishOnError: true
               includeForks: true
@@ -635,11 +635,11 @@ extends:
             - bash: "echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p"
               displayName: Increase inotify limit
             artifacts:
-            - name: Linux_Test_Logs
+            - name: Linux_Test_Logs_Attempt_$(System.JobAttempt)
               path: artifacts/log/
               publishOnError: true
               includeForks: true
-            - name: Linux_Test_Results
+            - name: Linux_Test_Results_Attempt_$(System.JobAttempt)
               path: artifacts/TestResults/
               publishOnError: true
               includeForks: true
@@ -666,7 +666,7 @@ extends:
                 SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops
 
             artifacts:
-            - name: Helix_logs
+            - name: Helix_Logs_Attempt_$(System.JobAttempt)
               path: artifacts/log/
               publishOnError: true
               includeForks: true