diff --git a/build/NuSpecs/build/Umbraco.Cms.StaticAssets.targets b/build/NuSpecs/build/Umbraco.Cms.StaticAssets.targets
index 37b65e320c..0d712e083b 100644
--- a/build/NuSpecs/build/Umbraco.Cms.StaticAssets.targets
+++ b/build/NuSpecs/build/Umbraco.Cms.StaticAssets.targets
@@ -1,18 +1,26 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
     <PropertyGroup>
-        <ContentFilesPath>$(MSBuildThisFileDirectory)..\content\**\*.*</ContentFilesPath>
+        <ContentFilesPath>$(MSBuildThisFileDirectory)..\content\umbraco\**\*.*</ContentFilesPath>
+        <ContentWwwrootFilesPath>$(MSBuildThisFileDirectory)..\content\wwwroot\umbraco\**\*.*</ContentWwwrootFilesPath>
+        <UmbracoWwwrootName Condition="'$(UmbracoWwwrootName)' == ''">umbraco</UmbracoWwwrootName>
     </PropertyGroup>
 
     <Target Name="CopyUmbracoAssets" BeforeTargets="Build">
         <ItemGroup>
 
             <ContentFiles Include="$(ContentFilesPath)" />
+            <ContentWwwrootFiles Include="$(ContentWwwrootFilesPath)" />
         </ItemGroup>
         <Message Text="Copying Umbraco content files: $(ContentFilesPath) - #@(ContentFiles->Count()) files"  Importance="high" />
+        <Message Text="Copying Umbraco wwwroot content files: $(ContentWwwrootFilesPath) - #@(ContentWwwrootFiles->Count()) files"  Importance="high" />
         <Copy
             SourceFiles="@(ContentFiles)"
-            DestinationFiles="@(ContentFiles->'$(MSBuildProjectDirectory)\%(RecursiveDir)%(Filename)%(Extension)')"
+            DestinationFiles="@(ContentFiles->'$(MSBuildProjectDirectory)\umbraco\%(RecursiveDir)%(Filename)%(Extension)')"
+            SkipUnchangedFiles="true" />
+        <Copy
+            SourceFiles="@(ContentWwwrootFiles)"
+            DestinationFiles="@(ContentWwwrootFiles->'$(MSBuildProjectDirectory)\wwwroot\$(UmbracoWwwrootName)\%(RecursiveDir)%(Filename)%(Extension)')"
             SkipUnchangedFiles="true" />
 
     </Target>
@@ -24,7 +32,7 @@
             <UmbracoUmbracoBackOfficeMacrosDir Include="$(MSBuildProjectDirectory)\umbraco\UmbracoBackOffice\" />
             <UmbracoUmbracoInstallDir Include="$(MSBuildProjectDirectory)\umbraco\UmbracoInstall\" />
             <UmbracoUmbracoWebsiteMacrosDir Include="$(MSBuildProjectDirectory)\umbraco\UmbracoWebsite\" />
-            <WwwrootUmbracoPackageDir Include="$(MSBuildProjectDirectory)\wwwroot\umbraco\" />
+            <WwwrootUmbracoPackageDir Include="$(MSBuildProjectDirectory)\wwwroot\$(UmbracoWwwrootName)\" />
         </ItemGroup>
         <Message Text="Clear old umbraco data"  Importance="high" />
         <RemoveDir Directories="@(UmbracoConfigPackageDir)"  />
diff --git a/src/Umbraco.Web.BackOffice/Install/InstallController.cs b/src/Umbraco.Web.BackOffice/Install/InstallController.cs
index 6e5b3314db..ca29a508c4 100644
--- a/src/Umbraco.Web.BackOffice/Install/InstallController.cs
+++ b/src/Umbraco.Web.BackOffice/Install/InstallController.cs
@@ -93,7 +93,7 @@ namespace Umbraco.Cms.Web.BackOffice.Install
 
             await _installHelper.SetInstallStatusAsync(false, "");
 
-            return View(Path.Combine(baseFolder , Cms.Core.Constants.Web.Mvc.InstallArea, nameof(Index) + ".cshtml"));
+            return View(Path.Combine(Constants.SystemDirectories.Umbraco.TrimStart("~") , Cms.Core.Constants.Web.Mvc.InstallArea, nameof(Index) + ".cshtml"));
         }
 
         /// <summary>