diff --git a/nuspec/nuget/Cake.Issues.MsBuild.nuspec b/nuspec/nuget/Cake.Issues.MsBuild.nuspec
index 1cc92059a..3dd9de4c2 100644
--- a/nuspec/nuget/Cake.Issues.MsBuild.nuspec
+++ b/nuspec/nuget/Cake.Issues.MsBuild.nuspec
@@ -28,12 +28,23 @@ See the Project Site for an overview of the whole ecosystem of addins for workin
   </metadata>
   <files>
     <file src="..\..\..\..\nuspec\nuget\icon.png" target="" />
-    <file src="netstandard2.0\Cake.Issues.MsBuild.dll" target="lib\netstandard2.0" />
-    <file src="netstandard2.0\Cake.Issues.MsBuild.pdb" target="lib\netstandard2.0" />
-    <file src="netstandard2.0\Cake.Issues.MsBuild.xml" target="lib\netstandard2.0" />
-    <file src="netstandard2.0\StructuredLogger.dll" target="lib\netstandard2.0" />
-    <file src="netstandard2.0\Microsoft.Build.Framework.dll" target="lib\netstandard2.0" />
-    <file src="netstandard2.0\Microsoft.Build.Utilities.Core.dll" target="lib\netstandard2.0" />
-    <file src="netstandard2.0\System.Collections.Immutable.dll" target="lib\netstandard2.0" />
+    <file src="netcoreapp3.1\Cake.Issues.MsBuild.dll" target="lib\netcoreapp3.1" />
+    <file src="netcoreapp3.1\Cake.Issues.MsBuild.pdb" target="lib\netcoreapp3.1" />
+    <file src="netcoreapp3.1\Cake.Issues.MsBuild.xml" target="lib\netcoreapp3.1" />
+    <file src="netcoreapp3.1\StructuredLogger.dll" target="lib\netcoreapp3.1" />
+    <file src="netcoreapp3.1\Microsoft.Build.Framework.dll" target="lib\netcoreapp3.1" />
+    <file src="netcoreapp3.1\Microsoft.Build.Utilities.Core.dll" target="lib\netcoreapp3.1" />
+    <file src="net5.0\Cake.Issues.MsBuild.dll" target="lib\net5.0" />
+    <file src="net5.0\Cake.Issues.MsBuild.pdb" target="lib\net5.0" />
+    <file src="net5.0\Cake.Issues.MsBuild.xml" target="lib\net5.0" />
+    <file src="net5.0\StructuredLogger.dll" target="lib\net5.0" />
+    <file src="net5.0\Microsoft.Build.Framework.dll" target="lib\net5.0" />
+    <file src="net5.0\Microsoft.Build.Utilities.Core.dll" target="lib\net5.0" />
+    <file src="net6.0\Cake.Issues.MsBuild.dll" target="lib\net6.0" />
+    <file src="net6.0\Cake.Issues.MsBuild.pdb" target="lib\net6.0" />
+    <file src="net6.0\Cake.Issues.MsBuild.xml" target="lib\net6.0" />
+    <file src="net6.0\StructuredLogger.dll" target="lib\net6.0" />
+    <file src="net6.0\Microsoft.Build.Framework.dll" target="lib\net6.0" />
+    <file src="net6.0\Microsoft.Build.Utilities.Core.dll" target="lib\net6.0" />
   </files>
 </package>
\ No newline at end of file
diff --git a/src/Cake.Issues.MsBuild.Tests/Cake.Issues.MsBuild.Tests.csproj b/src/Cake.Issues.MsBuild.Tests/Cake.Issues.MsBuild.Tests.csproj
index 8c40d4526..4edc177a6 100644
--- a/src/Cake.Issues.MsBuild.Tests/Cake.Issues.MsBuild.Tests.csproj
+++ b/src/Cake.Issues.MsBuild.Tests/Cake.Issues.MsBuild.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <Product>Cake.Issues</Product>
     <Copyright>Copyright © BBT Software AG and contributors</Copyright>
diff --git a/src/Cake.Issues.MsBuild/Cake.Issues.MsBuild.csproj b/src/Cake.Issues.MsBuild/Cake.Issues.MsBuild.csproj
index 242414089..e822c8d08 100644
--- a/src/Cake.Issues.MsBuild/Cake.Issues.MsBuild.csproj
+++ b/src/Cake.Issues.MsBuild/Cake.Issues.MsBuild.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
     <Description>MsBuild support for the Cake.Issues Addin for Cake Build Automation System</Description>
     <Authors>BBT Software AG</Authors>
     <Company>BBT Software AG</Company>
@@ -10,6 +10,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
+    <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\Cake.Issues.MsBuild.xml</DocumentationFile>
     <DebugType>full</DebugType>
     <DebugSymbols>true</DebugSymbols>
     <AnalysisMode>AllEnabledByDefault</AnalysisMode>
@@ -17,14 +18,6 @@
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard2.0|AnyCPU'">
-    <DocumentationFile>bin\Debug\netstandard2.0\Cake.Issues.MsBuild.xml</DocumentationFile>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.0|AnyCPU'">
-    <DocumentationFile>bin\Release\netstandard2.0\Cake.Issues.MsBuild.xml</DocumentationFile>
-  </PropertyGroup>
-
   <ItemGroup>
     <PackageReference Include="Cake.Core" Version="1.0.0" />
     <PackageReference Include="Cake.Issues" Version="1.0.0" />