diff --git a/build/NuSpecs/UmbracoCms.nuspec b/build/NuSpecs/UmbracoCms.nuspec
index ef48ce0de2..3fc47b4527 100644
--- a/build/NuSpecs/UmbracoCms.nuspec
+++ b/build/NuSpecs/UmbracoCms.nuspec
@@ -17,7 +17,8 @@
         <repository type="git" url="https://github.com/umbraco/umbraco-cms" />
         <dependencies>
             <group targetFramework="net5.0">
-                <dependency id="Umbraco.Cms.Web" version="[$version$]" />
+                <dependency id="Umbraco.Cms.Web.Website" version="[$version$]" />
+                <dependency id="Umbraco.Cms.Web.BackOffice" version="[$version$]" />
             </group>
         </dependencies>
         <!--
diff --git a/build/build.ps1 b/build/build.ps1
index 58d56fcdfe..354557f1a4 100644
--- a/build/build.ps1
+++ b/build/build.ps1
@@ -424,7 +424,7 @@
     Write-Host "Restore NuGet"
     Write-Host "Logging to $($this.BuildTemp)\nuget.restore.log"
 	$params = "-Source", $nugetsourceUmbraco
-    &$this.BuildEnv.NuGet restore "$($this.SolutionRoot)\src\Umbraco.sln" > "$($this.BuildTemp)\nuget.restore.log" @params
+    &$this.BuildEnv.NuGet restore "$($this.SolutionRoot)\src\umbraco-netcore-only.sln" > "$($this.BuildTemp)\nuget.restore.log" @params
     if (-not $?) { throw "Failed to restore NuGet packages." }
   })
 
@@ -435,17 +435,17 @@
 
     Write-Host "Create NuGet packages"
 
-    &$this.BuildEnv.NuGet Pack "$nuspecs\UmbracoCms.Core.nuspec" `
-        -Properties BuildTmp="$($this.BuildTemp)" `
-        -Version "$($this.Version.Semver.ToString())" `
-        -Verbosity detailed -outputDirectory "$($this.BuildOutput)" > "$($this.BuildTemp)\nupack.cmscore.log"
-    if (-not $?) { throw "Failed to pack NuGet UmbracoCms.Core." }
+    &dotnet pack "$($this.SolutionRoot)\src\umbraco-netcore-only.sln" `
+        --output "$($this.BuildOutput)" `
+        --verbosity detailed `
+        -c Release `
+        -p:PackageVersion="$($this.Version.Semver.ToString())" > "$($this.BuildTemp)\pack.umbraco.log"
 
-    &$this.BuildEnv.NuGet Pack "$nuspecs\UmbracoCms.Web.nuspec" `
-        -Properties BuildTmp="$($this.BuildTemp)" `
-        -Version "$($this.Version.Semver.ToString())" `
-        -Verbosity detailed -outputDirectory "$($this.BuildOutput)" > "$($this.BuildTemp)\nupack.cmsweb.log"
-    if (-not $?) { throw "Failed to pack NuGet UmbracoCms.Web." }
+    &dotnet pack "$($this.SolutionRoot)\src\Umbraco.Examine.Lucene\Umbraco.Examine.Lucene.csproj" `
+        --output "$($this.BuildOutput)" `
+        --verbosity detailed `
+        -c Release `
+        -p:PackageVersion="$($this.Version.Semver.ToString())" > "$($this.BuildTemp)\pack.umbraco.Lucene.log"
 
     &$this.BuildEnv.NuGet Pack "$nuspecs\UmbracoCms.nuspec" `
         -Properties BuildTmp="$($this.BuildTemp)" `
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 2f38e4953b..3623f6e688 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -8,7 +8,7 @@
         <InformationalVersion>0.5.0</InformationalVersion>
         <FileVersion>0.5.0</FileVersion>
         <Product>Umbraco CMS</Product>
-        <RootNamespace>Umbraco.Core</RootNamespace>
+        <PackageId>Umbraco.Cms.Core</PackageId>
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
diff --git a/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj b/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj
index 71f10f003b..a1c0749953 100644
--- a/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj
+++ b/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj
@@ -4,8 +4,8 @@
         <TargetFramework>net472</TargetFramework>
         <RootNamespace>Umbraco.Cms.Infrastructure.Examine</RootNamespace>
         <Product>Umbraco CMS</Product>
-        <RootNamespace>Umbraco.Examine</RootNamespace>
         <Title>Umbraco.Examine.Lucene</Title>
+        <PackageId>Umbraco.Cms.Examine.Lucene</PackageId>
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
diff --git a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj
index cd49b2abb1..b14d519bca 100644
--- a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj
+++ b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj
@@ -4,6 +4,7 @@
         <TargetFramework>netstandard2.0</TargetFramework>
         <LangVersion>8</LangVersion>
         <RootNamespace>Umbraco.Cms.Infrastructure</RootNamespace>
+        <PackageId>Umbraco.Cms.Infrastructure</PackageId>
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
diff --git a/src/Umbraco.PublishedCache.NuCache/Umbraco.PublishedCache.NuCache.csproj b/src/Umbraco.PublishedCache.NuCache/Umbraco.PublishedCache.NuCache.csproj
index 8973054260..445c7d4aa3 100644
--- a/src/Umbraco.PublishedCache.NuCache/Umbraco.PublishedCache.NuCache.csproj
+++ b/src/Umbraco.PublishedCache.NuCache/Umbraco.PublishedCache.NuCache.csproj
@@ -4,7 +4,7 @@
         <TargetFramework>netstandard2.0</TargetFramework>
         <RootNamespace>Umbraco.Cms.Infrastructure.PublishedCache</RootNamespace>
         <LangVersion>8</LangVersion>
-        <RootNamespace>Umbraco.Infrastructure.PublishedCache</RootNamespace>
+        <PackageId>Umbraco.Cms.PublishedCache.NuCache</PackageId>
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
diff --git a/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj b/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj
index 8a1a0ebcdf..69a71a9698 100644
--- a/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj
+++ b/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj
@@ -5,6 +5,7 @@
         <OutputType>Library</OutputType>
         <LangVersion>latest</LangVersion>
         <RootNamespace>Umbraco.Cms.Web.BackOffice</RootNamespace>
+        <PackageId>Umbraco.Cms.Web.BackOffice</PackageId>
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
diff --git a/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj b/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj
index 2bcf4a3e55..aee8d5b3df 100644
--- a/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj
+++ b/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj
@@ -5,6 +5,7 @@
         <OutputType>Library</OutputType>
         <LangVersion>latest</LangVersion>
         <RootNamespace>Umbraco.Cms.Web.Common</RootNamespace>
+        <PackageId>Umbraco.Cms.Web.Common</PackageId>
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
diff --git a/src/Umbraco.Web.Website/Umbraco.Web.Website.csproj b/src/Umbraco.Web.Website/Umbraco.Web.Website.csproj
index 8b940ba47b..88f0ae89fd 100644
--- a/src/Umbraco.Web.Website/Umbraco.Web.Website.csproj
+++ b/src/Umbraco.Web.Website/Umbraco.Web.Website.csproj
@@ -5,6 +5,7 @@
         <OutputType>Library</OutputType>
         <LangVersion>latest</LangVersion>
         <RootNamespace>Umbraco.Cms.Web.Website</RootNamespace>
+        <PackageId>Umbraco.Cms.Web.Website</PackageId>
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 93cb8da83d..972b9d7b19 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -105,6 +105,7 @@
     <PackageReference Include="System.Threading.Tasks.Dataflow" Version="5.0.0" />
     <PackageReference Include="Umbraco.Code">
       <Version>1.0.5</Version>
+      <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>