diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 2a81965d31..1e4aaaa85c 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -55,7 +55,7 @@ jobs:
             - name: Setup DotNet SDK
               uses: actions/setup-dotnet@v1
               with:
-                  dotnet-version: "3.1.101"
+                  dotnet-version: "3.1.x"
 
             - name: Build
               shell: pwsh
@@ -98,7 +98,7 @@ jobs:
             - name: Setup DotNet SDK
               uses: actions/setup-dotnet@v1
               with:
-                  dotnet-version: "3.1.101"
+                  dotnet-version: "3.1.x"
 
             - name: Pack
               shell: pwsh
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
index ac2f772e3d..0baceca35a 100644
--- a/src/Directory.Build.targets
+++ b/src/Directory.Build.targets
@@ -22,13 +22,24 @@
 
   <!-- Workaround for using SDK < 3.1.300, which we cannot use since it breaks coverlet -->
   <!-- https://github.com/clairernovotny/DeterministicBuilds -->
-  <PropertyGroup>
+  <!--<PropertyGroup>
     <TargetFrameworkMonikerAssemblyAttributesPath>$([System.IO.Path]::Combine('$(IntermediateOutputPath)','$(TargetFrameworkMoniker).AssemblyAttributes$(DefaultLanguageSourceExtension)'))</TargetFrameworkMonikerAssemblyAttributesPath>
   </PropertyGroup>
   <ItemGroup>
     <EmbeddedFiles Include="$(GeneratedAssemblyInfoFile)"/>
-  </ItemGroup>
+  </ItemGroup>-->
 
+  <!-- Workaround for running Coverlet with Determenistic builds -->
+  <!-- https://github.com/coverlet-coverage/coverlet/blob/master/Documentation/DeterministicBuild.md -->
+  <Target Name="CoverletGetPathMap"
+            DependsOnTargets="InitializeSourceRootMappedPaths"
+            Returns="@(_LocalTopLevelSourceRoot)"
+            Condition="'$(DeterministicSourcePaths)' == 'true'">
+    <ItemGroup>
+      <_LocalTopLevelSourceRoot Include="@(SourceRoot)" Condition="'%(SourceRoot.NestedRoot)' == ''"/>
+    </ItemGroup>
+  </Target>
+  
   <ItemDefinitionGroup>
     <InternalsVisibleTo>
       <Visible>false</Visible>