diff --git a/eng/CodeCoverage.targets b/eng/CodeCoverage.targets
index f38947af3980..e2ca1fc85b30 100644
--- a/eng/CodeCoverage.targets
+++ b/eng/CodeCoverage.targets
@@ -34,7 +34,9 @@
       <CoverageReportCommandLine>$(CoverageReportCommandLine) "-filefilters:+$(CodeCoverageDirectory)\**"</CoverageReportCommandLine>
     </PropertyGroup>
     <Exec Command="$(CoverageReportCommandLine)"
-          IgnoreExitCode="true" />
+          IgnoreExitCode="true"
+          StandardErrorImportance="high"
+          StandardOutputImportance="low" />
   </Target>
 
   <!--
diff --git a/eng/Directory.Build.Data.targets b/eng/Directory.Build.Data.targets
index e12b292d59be..2ec43efad760 100644
--- a/eng/Directory.Build.Data.targets
+++ b/eng/Directory.Build.Data.targets
@@ -77,7 +77,7 @@
     and likely easier to remember than the VSTest platform integration.
     Also: https://github.com/coverlet-coverage/coverlet/blob/master/Documentation/KnownIssues.md#1-vstest-stops-process-execution-earlydotnet-test
   -->
-  <PropertyGroup Condition="'$(CollectCoverage)' == 'true' and '$(IsClientLibrary)' == 'true' and '$(IsTestProject)' == 'true' and '$(ExcludeFromCodeCoverage)' != 'true'">
+  <PropertyGroup Condition="'$(CollectCoverage)' == 'true' and '$(IsClientLibrary)' == 'true' and '$(IsTestProject)' == 'true' and '$(IsMgmtClientLibrary)' != 'true' and '$(ExcludeFromCodeCoverage)' != 'true'">
     <_ImportCodeCoverage>true</_ImportCodeCoverage>
     <VSTestCollect Condition="'$(VSTestCollect)' == ''">XPlat Code Coverage</VSTestCollect>
     <!-- Override this property in your projects' or solutions' Directory.Build.props to further customize code coverage. -->
diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml
index 351568ab83e2..93d3bbaa19dd 100644
--- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml
+++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml
@@ -110,8 +110,8 @@ jobs:
     condition: and(succeededOrFailed(), ne(variables['Skip.Test'], true))
     variables:
       - template: ../variables/globals.yml
-      - name: disable.coverage.autogenerate
-        value: true
+      # - name: disable.coverage.autogenerate
+      #   value: true
     strategy:
       maxParallel: $[ variables['MaxParallelTestJobs'] ]
       matrix:
@@ -172,7 +172,7 @@ jobs:
         inputs:
           reports: $(Build.SourcesDirectory)\sdk\${{parameters.ServiceDirectory}}\**\coverage.cobertura.xml
           targetdir: $(Build.SourcesDirectory)
-          reporttypes: Cobertura;HtmlSummary
+          reporttypes: Cobertura
           filefilters: +$(Build.SourcesDirectory)\sdk\${{parameters.ServiceDirectory}}\**
           verbosity: Verbose
       - task: PublishCodeCoverageResults@1