diff --git a/eng/pipelines/client.yml b/eng/pipelines/client.yml
index 12c08140c139..a3622032f797 100644
--- a/eng/pipelines/client.yml
+++ b/eng/pipelines/client.yml
@@ -109,7 +109,7 @@ jobs:
           jdkVersionOption: '1.11'
           jdkArchitectureOption: 'x64'
           publishJUnitResults: false
-          goals: 'spotbugs:spotbugs checkstyle:checkstyle'
+          goals: 'spotbugs:spotbugs checkstyle:checkstyle-aggregate'
 
       # Generate the Maven site report, including SpotBugs, JavaDoc, CheckStyle, Jacoco, etc only when we are not
       # running as a PR check.
diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml
index 68949203610d..e8cfa1bf2ac0 100644
--- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml
+++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml
@@ -104,7 +104,7 @@ jobs:
           jdkVersionOption: '1.11'
           jdkArchitectureOption: 'x64'
           publishJUnitResults: false
-          goals: 'spotbugs:spotbugs checkstyle:checkstyle'
+          goals: 'spotbugs:spotbugs checkstyle:checkstyle-aggregate'
 
       # Generate the Maven site report, including SpotBugs, JavaDoc, CheckStyle, Jacoco, etc only when we are not
       # running as a PR check.