diff --git a/build/NuSpecs/UmbracoCms.nuspec b/build/NuSpecs/UmbracoCms.nuspec
index 7f0b0f9626..5db3a439d9 100644
--- a/build/NuSpecs/UmbracoCms.nuspec
+++ b/build/NuSpecs/UmbracoCms.nuspec
@@ -16,43 +16,27 @@
         <tags>umbraco</tags>
         <repository type="git" url="https://github.com/umbraco/umbraco-cms" />
         <dependencies>
-
             <group targetFramework="netcoreapp3.1">
-
                 <dependency id="UmbracoCms.Web" version="9.0.0" />
-
             </group>
-
         </dependencies>
+        <!--
+        We can't use content files, as the files need to be copied into the solution, links/shortcuts to the files
+        are not good enough
+        -->
+        <contentFiles />
     </metadata>
     <files>
-        <!-- files -->
-        <file src="$BuildTmp$\Configs\**" target="Content\Config" exclude="$BuildTmp$\Configs\Web.config.transform" />
-        <!--Don't have them <file src="$BuildTmp$\WebApp\Views\**" target="Content\Views" exclude="$BuildTmp$\WebApp\Views\Web.config" />-->
-        <!--Don't have them file src="$BuildTmp$\WebApp\Global.asax" target="Content\Global.asax" />-->
-        <file src="$BuildTmp$\WebApp\config\BackOfficeTours\**" target="Content\Config\BackOfficeTours" />
-        <!--<file src="$BuildTmp$\WebApp\Media\Web.config" target="Content\Media\Web.config" />-->
+        <!-- Content -->
+        <file src="$BuildTmp$\WebApp\wwwroot\umbraco\**\*.*" target="content\wwwroot\umbraco" />
+        <file src="$BuildTmp$\WebApp\umbraco\**\*.*" target="content\umbraco" />
+        <file src="$BuildTmp$\WebApp\config\**\*.*" target="content\config" />
 
-        <!-- these files are copied by install.ps1 -->
-        <!--<file src="$BuildTmp$\WebApp\Web.config" target="UmbracoFiles\Web.config" />
-        <file src="$BuildTmp$\WebApp\umbraco\**" target="UmbracoFiles\umbraco" />
-        <file src="$BuildTmp$\WebApp\config\splashes\**" target="UmbracoFiles\Config\splashes" />-->
+        <!-- Readme -->
+        <file src="tools\Readme.txt" target="Readme.txt" />
+        <file src="tools\ReadmeUpgrade.txt" target="ReadmeUpgrade.txt" />
 
-        <!-- tools -->
-        <!-- beware! install.ps1 not supported by PackageReference -->
-        <!--<file src="tools\install.ps1" target="tools\install.ps1" />-->
-        <file src="tools\Readme.txt" target="tools\Readme.txt" />
-        <file src="tools\ReadmeUpgrade.txt" target="tools\ReadmeUpgrade.txt" />
-
-        <!-- config transforms -->
-        <!-- beware! config transforms not supported by PackageReference -->
-        <!--<file src="tools\Web.config.install.xdt" target="Content\Web.config.install.xdt" />
-        <file src="tools\serilog.config.install.xdt" target="Content\config\serilog.config.install.xdt" />
-        <file src="tools\ClientDependency.config.install.xdt" target="Content\config\ClientDependency.config.install.xdt" />
-        <file src="tools\umbracoSettings.config.install.xdt" target="Content\config\umbracoSettings.config.install.xdt" />
-        <file src="tools\Views.Web.config.install.xdt" target="Views\Web.config.install.xdt" /> --><!-- FIXME: Content\ !! and then... transform?! -->
-
-        <!-- UmbracoCms props and targets -->
-        <file src="build\**" target="build" />
+        <!-- UmbracoCms props and targets used to copy the content into the solution -->
+        <file src="build\**" target="build\" />
     </files>
 </package>
diff --git a/build/NuSpecs/build/UmbracoCms.props b/build/NuSpecs/build/UmbracoCms.props
index 1422a4cd76..371b0aa5ab 100644
--- a/build/NuSpecs/build/UmbracoCms.props
+++ b/build/NuSpecs/build/UmbracoCms.props
@@ -1,13 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <CopyAllFilesToSingleFolderForPackageDependsOn>
-      AddUmbracoFilesToOutput;
-      $(CopyAllFilesToSingleFolderForPackageDependsOn);
-    </CopyAllFilesToSingleFolderForPackageDependsOn>
-    <CopyAllFilesToSingleFolderForMsdeployDependsOn>
-      AddUmbracoFilesToOutput;
-      $(CopyAllFilesToSingleFolderForPackageDependsOn);
-    </CopyAllFilesToSingleFolderForMsdeployDependsOn>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+    <PropertyGroup>
+        <DefaultItemExcludes>$(DefaultItemExcludes);wwwroot\is-cache\**;wwwroot\ms-cache\**</DefaultItemExcludes>
+    </PropertyGroup>
+
+</Project>
diff --git a/build/NuSpecs/build/UmbracoCms.targets b/build/NuSpecs/build/UmbracoCms.targets
index ac0e9e976d..29d972d480 100644
--- a/build/NuSpecs/build/UmbracoCms.targets
+++ b/build/NuSpecs/build/UmbracoCms.targets
@@ -1,58 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Target Name="CopyUmbracoFilesToWebRootForDeploy" AfterTargets="CopyAllFilesToSingleFolderForMsdeploy">
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
     <PropertyGroup>
-      <UmbracoFilesFolder>$(MSBuildThisFileDirectory)..\UmbracoFiles\</UmbracoFilesFolder>
+        <ContentFilesPath>$(MSBuildThisFileDirectory)..\content\**\*.*</ContentFilesPath>
     </PropertyGroup>
-    <ItemGroup>
-      <UmbracoFiles Include="$(UmbracoFilesFolder)**\*" />
-    </ItemGroup>
-    <Copy SourceFiles="%(UmbracoFiles.FullPath)" DestinationFiles="$(_PackageTempDir)\%(RecursiveDir)%(Filename)%(Extension)" Condition="!Exists('%(RecursiveDir)%(Filename)%(Extension)')" />
-  </Target>  
-  <Target Name="CopyUmbracoFilesToWebRoot" BeforeTargets="AfterBuild">
-	<!-- This copies the files listed in `AddUmbracoFilesToOutput` to the webroot during NuGet install and should -->
-	<!-- not be altered to support automated builds, use `CopyUmbracoFilesToWebRootForDeploy` for that instead -->
-    <PropertyGroup>
-      <UmbracoFilesFolder>$(MSBuildThisFileDirectory)..\UmbracoFiles\</UmbracoFilesFolder>
-    </PropertyGroup>
-    <ItemGroup>
-      <UmbracoFiles Include="$(UmbracoFilesFolder)**\*" />
-    </ItemGroup>
-    <Copy SourceFiles="%(UmbracoFiles.FullPath)" DestinationFiles="%(RecursiveDir)%(Filename)%(Extension)" Condition="!Exists('%(RecursiveDir)%(Filename)%(Extension)')" />
-  </Target>
-  <Target Name="AddUmbracoFilesToOutput">
-    <!-- With help from: http://blog.samstephens.co.nz/2010-10-18/msbuild-including-extra-files-multiple-builds/ -->
-    <ItemGroup>
-      <CustomFilesToInclude Include=".\App_Browsers\**\*">
-        <Dir>App_Browsers</Dir>
-      </CustomFilesToInclude>
-      <CustomFilesToInclude Include=".\App_Code\**\*">
-        <Dir>App_Code</Dir>
-      </CustomFilesToInclude>
-      <CustomFilesToInclude Include=".\App_Plugins\**\*">
-        <Dir>App_Plugins</Dir>
-      </CustomFilesToInclude>
-      <CustomFilesToInclude Include=".\bin\amd64\**\*">
-        <Dir>bin\amd64</Dir>
-      </CustomFilesToInclude>
-      <CustomFilesToInclude Include=".\bin\x86\**\*">
-        <Dir>bin\x86</Dir>
-      </CustomFilesToInclude>
-      <CustomFilesToInclude Include=".\Config\Splashes\**\*">
-        <Dir>Config\Splashes</Dir>
-      </CustomFilesToInclude>
-      <CustomFilesToInclude Include=".\data\**\*">
-        <Dir>data</Dir>
-      </CustomFilesToInclude>
-      <CustomFilesToInclude Include=".\umbraco\**\*">
-        <Dir>umbraco</Dir>
-      </CustomFilesToInclude>
-      <CustomFilesToInclude Include=".\Global.asax">
-        <Dir>.</Dir>
-      </CustomFilesToInclude>
-      <FilesForPackagingFromProject Include="@(CustomFilesToInclude)">
-        <DestinationRelativePath>%(CustomFilesToInclude.Dir)\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
-      </FilesForPackagingFromProject>
-    </ItemGroup>
-  </Target>
+
+    <Target Name="CopyUmbracoAssets" BeforeTargets="Build">
+        <ItemGroup>
+
+            <ContentFiles Include="$(ContentFilesPath)" />
+        </ItemGroup>
+        <Message Text="Copying content files: $(ContentFilesPath) - #@(ContentFiles->Count()) files"  Importance="high" />
+        <Copy
+            SourceFiles="@(ContentFiles)"
+            DestinationFiles="@(ContentFiles->'$(MSBuildProjectDirectory)\%(RecursiveDir)%(Filename)%(Extension)')"
+            SkipUnchangedFiles="true" />
+
+    </Target>
+
 </Project>