diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml
index c9a283bc7789..63b6a3427b2b 100644
--- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml
+++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml
@@ -101,6 +101,10 @@ jobs:
         displayName: 'Publish Artifacts $(ArtifactName)'
         artifact: '$(ArtifactName)'
 
+      - publish: $(System.DefaultWorkingDirectory)
+        condition: failed()
+        displayName: 'Capture repo state for analysis'
+        artifact: repository
 
   - job: 'Analyze'
     condition: ne(variables['Skip.Analyze'], 'true')
@@ -239,11 +243,6 @@ jobs:
         displayName: 'Publish Report Artifacts'
         artifact: reports
 
-      - publish: $(System.DefaultWorkingDirectory)
-        condition: failed()
-        displayName: 'Capture repo state for analysis'
-        artifact: repository
-
   - job: 'Test'
     condition: ne(variables['Skip.Test'], 'true')