diff --git a/Oqtane.Application/AppHost/Oqtane.Application.AppHost.csproj b/Oqtane.Application/AppHost/Oqtane.Application.AppHost.csproj
index 9490f607..9a9cb9fa 100644
--- a/Oqtane.Application/AppHost/Oqtane.Application.AppHost.csproj
+++ b/Oqtane.Application/AppHost/Oqtane.Application.AppHost.csproj
@@ -2,50 +2,11 @@
 
   <PropertyGroup>
     <TargetFramework>net9.0</TargetFramework>
-    <Version>6.1.5</Version>
+    <Version>1.0.0</Version>
     <AssemblyName>Oqtane.Application.AppHost</AssemblyName>
   </PropertyGroup>
 
-	<ItemGroup>
-		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.8" />
-		<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.8" />
-		<PackageReference Include="Microsoft.Data.SqlClient" Version="6.1.1" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.8" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.8">
-			<PrivateAssets>all</PrivateAssets>
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-		</PackageReference>
-		<PackageReference Include="Microsoft.Extensions.Localization" Version="9.0.8" />
-		<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="9.0.8" />
-		<PackageReference Include="SixLabors.ImageSharp" Version="3.1.11" />
-		<PackageReference Include="HtmlAgilityPack" Version="1.12.2" />
-		<PackageReference Include="Swashbuckle.AspNetCore" Version="9.0.3" />
-		<PackageReference Include="MailKit" Version="4.13.0" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<!-- MySQL Database Provider Dependencies -->
-		<PackageReference Include="MySql.Data" Version="9.4.0" />
-		<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="9.0.0-preview.3.efcore.9.0.0" />
-		<!-- PostgreSQL Database Provider Dependencies -->
-		<PackageReference Include="EFCore.NamingConventions" Version="9.0.0" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.8" />
-		<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4" />
-		<!-- SQLite Database Provider Dependencies -->
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.8" />
-		<PackageReference Include="Microsoft.Data.Sqlite.Core" Version="9.0.8" />
-		<PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="3.0.1" />
-		<!-- SQL Server Database Provider Dependencies -->
-		<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.8" />
-	</ItemGroup>
-	
-	<ItemGroup>
-		<PackageReference Include="Oqtane.Client" Version="6.1.5" />
-		<PackageReference Include="Oqtane.Server" Version="6.1.5" />
-		<PackageReference Include="Oqtane.Shared" Version="6.1.5" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<ProjectReference Include="..\Server\Oqtane.Application.Server.csproj" />
-	</ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Server\Oqtane.Application.Server.csproj" />
+  </ItemGroup>
 </Project>
diff --git a/Oqtane.Application/Build/Oqtane.Application.Build.csproj b/Oqtane.Application/Build/Oqtane.Application.Build.csproj
deleted file mode 100644
index af1c3888..00000000
--- a/Oqtane.Application/Build/Oqtane.Application.Build.csproj
+++ /dev/null
@@ -1,20 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
-    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
-    <AccelerateBuildsInVisualStudio>false</AccelerateBuildsInVisualStudio>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Client\Oqtane.Application.Client.csproj" />
-    <ProjectReference Include="..\Server\Oqtane.Application.Server.csproj" />
-    <ProjectReference Include="..\Shared\Oqtane.Application.Shared.csproj" />
-  </ItemGroup>
-
-  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-    <Exec Condition="'$(OS)' == 'Windows_NT'" Command="debug.cmd $(TargetFramework) $([System.String]::Copy('$(MSBuildProjectName)').Replace('.Build',''))"  />
-    <Exec Condition="'$(OS)' != 'Windows_NT'" Command="bash $(ProjectDir)debug.sh $(TargetFramework) $([System.String]::Copy('$(MSBuildProjectName)').Replace('.Build',''))" />
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/Oqtane.Application/Build/debug.cmd b/Oqtane.Application/Build/debug.cmd
deleted file mode 100644
index 697dd3ae..00000000
--- a/Oqtane.Application/Build/debug.cmd
+++ /dev/null
@@ -1 +0,0 @@
-XCOPY "..\Server\wwwroot\*" "..\AppHost\wwwroot\" /Y /S /I
\ No newline at end of file
diff --git a/Oqtane.Application/Build/debug.sh b/Oqtane.Application/Build/debug.sh
deleted file mode 100644
index bf088d67..00000000
--- a/Oqtane.Application/Build/debug.sh
+++ /dev/null
@@ -1 +0,0 @@
-cp -rf "../Server/wwwroot/"* "../AppHost/wwwroot/"
\ No newline at end of file
diff --git a/Oqtane.Application/Client/Oqtane.Application.Client.csproj b/Oqtane.Application/Client/Oqtane.Application.Client.csproj
index ae37ebd5..865765fc 100644
--- a/Oqtane.Application/Client/Oqtane.Application.Client.csproj
+++ b/Oqtane.Application/Client/Oqtane.Application.Client.csproj
@@ -6,21 +6,13 @@
     <AssemblyName>Oqtane.Application.Client.Oqtane</AssemblyName>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.8" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="9.0.8" />
-    <PackageReference Include="Microsoft.Extensions.Localization" Version="9.0.8" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="9.0.8" />
-    <PackageReference Include="System.Net.Http.Json" Version="9.0.8" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\Shared\Oqtane.Application.Shared.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Oqtane.Client" Version="6.1.5" />
-    <PackageReference Include="Oqtane.Shared" Version="6.1.5" />
+    <PackageReference Include="Oqtane.Client" Version="6.1.6" />
+    <PackageReference Include="Oqtane.Shared" Version="6.1.6" />
   </ItemGroup>
 
   <PropertyGroup>
diff --git a/Oqtane.Application/Oqtane.Application.sln b/Oqtane.Application/Oqtane.Application.sln
index c5b05c71..a1054772 100644
--- a/Oqtane.Application/Oqtane.Application.sln
+++ b/Oqtane.Application/Oqtane.Application.sln
@@ -10,8 +10,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Oqtane.Application.Server",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Oqtane.Application.Shared", "Shared\Oqtane.Application.Shared.csproj", "{18D73F73-D7BE-4388-85BA-FBD9AC96FCA2}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Oqtane.Application.Build", "Build\Oqtane.Application.Build.csproj", "{C5CE512D-CBB7-4545-AF0F-9B6591A0C3A7}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -34,10 +32,6 @@ Global
 		{18D73F73-D7BE-4388-85BA-FBD9AC96FCA2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{18D73F73-D7BE-4388-85BA-FBD9AC96FCA2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{18D73F73-D7BE-4388-85BA-FBD9AC96FCA2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C5CE512D-CBB7-4545-AF0F-9B6591A0C3A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C5CE512D-CBB7-4545-AF0F-9B6591A0C3A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C5CE512D-CBB7-4545-AF0F-9B6591A0C3A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C5CE512D-CBB7-4545-AF0F-9B6591A0C3A7}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Oqtane.Application/Server/Oqtane.Application.Server.csproj b/Oqtane.Application/Server/Oqtane.Application.Server.csproj
index 44826c6b..69ea8563 100644
--- a/Oqtane.Application/Server/Oqtane.Application.Server.csproj
+++ b/Oqtane.Application/Server/Oqtane.Application.Server.csproj
@@ -7,25 +7,20 @@
     <AssemblyName>Oqtane.Application.Server.Oqtane</AssemblyName>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Content Remove="wwwroot\_content\**\*.*" />
-    <None Include="wwwroot\_content\**\*.*" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.8" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.8" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.8" />
-    <PackageReference Include="Microsoft.Extensions.Localization" Version="9.0.8" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\Client\Oqtane.Application.Client.csproj" />
     <ProjectReference Include="..\Shared\Oqtane.Application.Shared.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Oqtane.Server" Version="6.1.5" />
-    <PackageReference Include="Oqtane.Shared" Version="6.1.5" />
+    <PackageReference Include="Oqtane.Server" Version="6.1.6" />
+    <PackageReference Include="Oqtane.Shared" Version="6.1.6" />
   </ItemGroup>
+
+  <Target Name="CopyStaticAssets" AfterTargets="Build">
+    <ItemGroup>
+      <StaticAssets Include="$(ProjectDir)wwwroot\**\*.*" />
+    </ItemGroup>
+    <Copy SourceFiles="@(StaticAssets)" DestinationFolder="$(ProjectDir)..\AppHost\wwwroot\%(RecursiveDir)" SkipUnchangedFiles="true" />
+  </Target>
 </Project>
diff --git a/Oqtane.Application/Shared/Oqtane.Application.Shared.csproj b/Oqtane.Application/Shared/Oqtane.Application.Shared.csproj
index 641056f4..865461b1 100644
--- a/Oqtane.Application/Shared/Oqtane.Application.Shared.csproj
+++ b/Oqtane.Application/Shared/Oqtane.Application.Shared.csproj
@@ -7,11 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Oqtane.Shared" Version="6.1.5" />
+    <PackageReference Include="Oqtane.Shared" Version="6.1.6" />
   </ItemGroup>
 
 </Project>
diff --git a/Oqtane.Package/Oqtane.Client.nuspec b/Oqtane.Package/Oqtane.Client.nuspec
index 18ea653b..3adc1e20 100644
--- a/Oqtane.Package/Oqtane.Client.nuspec
+++ b/Oqtane.Package/Oqtane.Client.nuspec
@@ -2,7 +2,7 @@
 <package>
   <metadata>
     <id>Oqtane.Client</id>
-    <version>6.1.5</version>
+    <version>6.1.6</version>
     <authors>Shaun Walker</authors>
     <owners>.NET Foundation</owners>
     <title>Oqtane Framework</title>
@@ -16,6 +16,15 @@
     <readme>readme.md</readme>
     <icon>icon.png</icon>
     <tags>oqtane</tags>
+    <dependencies>
+      <group targetFramework="net9.0">
+        <dependency id="Oqtane.Shared" version="6.1.5" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.AspNetCore.Components.WebAssembly" version="9.0.8" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.AspNetCore.Components.WebAssembly.Authentication" version="9.0.8" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.Extensions.Http" version="9.0.8" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.Extensions.Localization" version="9.0.8" exclude="Build,Analyzers" />
+      </group>
+    </dependencies>
   </metadata>
   <files>
     <file src="..\Oqtane.Client\bin\Release\net9.0\Oqtane.Client.dll" target="lib\net9.0" /> 
diff --git a/Oqtane.Package/Oqtane.Server.nuspec b/Oqtane.Package/Oqtane.Server.nuspec
index d7e88718..96074428 100644
--- a/Oqtane.Package/Oqtane.Server.nuspec
+++ b/Oqtane.Package/Oqtane.Server.nuspec
@@ -2,7 +2,7 @@
 <package>
   <metadata>
     <id>Oqtane.Server</id>
-    <version>6.1.5</version>
+    <version>6.1.6</version>
     <authors>Shaun Walker</authors>
     <owners>.NET Foundation</owners>
     <title>Oqtane Framework</title>
@@ -16,6 +16,36 @@
     <readme>readme.md</readme>
     <icon>icon.png</icon>
     <tags>oqtane</tags>
+    <dependencies>
+      <group targetFramework="net9.0">
+        <dependency id="Oqtane.Client" version="6.1.5" exclude="Build,Analyzers" />
+        <dependency id="Oqtane.Shared" version="6.1.5" exclude="Build,Analyzers" />
+        <dependency id="EFCore.NamingConventions" version="9.0.0" exclude="Build,Analyzers" />
+        <dependency id="HtmlAgilityPack" version="1.12.2" exclude="Build,Analyzers" />
+        <dependency id="MailKit" version="4.13.0" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.AspNetCore.Authentication.OpenIdConnect" version="9.0.8" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.AspNetCore.Components.WebAssembly.Server" version="9.0.8" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.AspNetCore.Identity.EntityFrameworkCore" version="9.0.8" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.Data.SqlClient" version="6.1.1" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.Data.Sqlite.Core" version="9.0.8" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.EntityFrameworkCore" version="9.0.8" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.EntityFrameworkCore.Relational" version="9.0.8" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.EntityFrameworkCore.SqlServer" version="9.0.8" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.EntityFrameworkCore.Sqlite" version="9.0.8" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.Extensions.Localization" version="9.0.8" exclude="Build,Analyzers" />
+        <dependency id="MySql.Data" version="9.4.0" exclude="Build,Analyzers" />
+        <dependency id="Npgsql.EntityFrameworkCore.PostgreSQL" version="9.0.4" exclude="Build,Analyzers" />
+        <dependency id="Pomelo.EntityFrameworkCore.MySql" version="9.0.0-preview.3.efcore.9.0.0" exclude="Build,Analyzers" />
+        <dependency id="SQLitePCLRaw.bundle_e_sqlite3" version="3.0.1" exclude="Build,Analyzers" />
+        <dependency id="SixLabors.ImageSharp" version="3.1.11" exclude="Build,Analyzers" />
+        <dependency id="Swashbuckle.AspNetCore" version="9.0.3" exclude="Build,Analyzers" />
+      </group>
+    </dependencies>
+    <frameworkReferences>
+      <group targetFramework="net9.0">
+        <frameworkReference name="Microsoft.AspNetCore.App" />
+      </group>
+    </frameworkReferences>
   </metadata>
   <files>
     <file src="..\Oqtane.Server\bin\Release\net9.0\Oqtane.Server.dll" target="lib\net9.0" /> 
diff --git a/Oqtane.Package/Oqtane.Shared.nuspec b/Oqtane.Package/Oqtane.Shared.nuspec
index f8e1f177..320f80f8 100644
--- a/Oqtane.Package/Oqtane.Shared.nuspec
+++ b/Oqtane.Package/Oqtane.Shared.nuspec
@@ -2,7 +2,7 @@
 <package>
   <metadata>
     <id>Oqtane.Shared</id>
-    <version>6.1.5</version>
+    <version>6.1.6</version>
     <authors>Shaun Walker</authors>
     <owners>.NET Foundation</owners>
     <title>Oqtane Framework</title>
@@ -16,6 +16,16 @@
     <readme>readme.md</readme>
     <icon>icon.png</icon>
     <tags>oqtane</tags>
+    <dependencies>
+      <group targetFramework="net9.0">
+        <dependency id="Microsoft.EntityFrameworkCore" version="9.0.8" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.EntityFrameworkCore.Relational" version="9.0.8" exclude="Build,Analyzers" />
+        <dependency id="Microsoft.Extensions.DependencyInjection.Abstractions" version="9.0.8" exclude="Build,Analyzers" />
+        <dependency id="NodaTime" version="3.2.2" exclude="Build,Analyzers" />
+        <dependency id="System.ComponentModel.Annotations" version="5.0.0" exclude="Build,Analyzers" />
+        <dependency id="System.Text.Json" version="9.0.8" exclude="Build,Analyzers" />
+      </group>
+    </dependencies>
   </metadata>
   <files>
     <file src="..\Oqtane.Shared\bin\Release\net9.0\Oqtane.Shared.dll" target="lib\net9.0" />
diff --git a/Oqtane.Package/release.cmd b/Oqtane.Package/release.cmd
index 641cd4c4..8b914c90 100644
--- a/Oqtane.Package/release.cmd
+++ b/Oqtane.Package/release.cmd
@@ -1,12 +1,12 @@
 del "*.nupkg"
 del "*.zip"
+rmdir /Q/S "..\Oqtane.Server\bin\Release\net9.0\publish"
 dotnet clean -c Release ..\Oqtane.sln 
 dotnet build -c Release ..\Oqtane.sln
 nuget.exe pack Oqtane.Client.nuspec
 nuget.exe pack Oqtane.Server.nuspec
 nuget.exe pack Oqtane.Shared.nuspec                  
 nuget.exe pack Oqtane.Framework.nuspec
-rmdir /Q/S "..\Oqtane.Server\bin\Release\net9.0\publish"
 dotnet publish ..\Oqtane.Server\Oqtane.Server.csproj /p:Configuration=Release
 rmdir /Q/S "..\Oqtane.Server\bin\Release\net9.0\publish\Content"
 rmdir /Q/S "..\Oqtane.Server\bin\Release\net9.0\publish\wwwroot\Content"