diff --git a/Projects/Application/Application.csproj b/Projects/Application/Application.csproj
index 997beb53e..130bcc78f 100644
--- a/Projects/Application/Application.csproj
+++ b/Projects/Application/Application.csproj
@@ -11,10 +11,21 @@
         <Configurations>Debug;Release;Analyze</Configurations>
         <RootNamespace>Server</RootNamespace>
     </PropertyGroup>
+    <Target Name="CleanPub" AfterTargets="Clean">
+        <Message Text="Application: Removing distribution files..." />
+        <Delete Files="..\..\Distribution\$(AssemblyName)" ContinueOnError="true" />
+        <Delete Files="..\..\Distribution\$(AssemblyName).deps.json" ContinueOnError="true" />
+        <Delete Files="..\..\Distribution\$(AssemblyName).dll" ContinueOnError="true" />
+        <Delete Files="..\..\Distribution\$(AssemblyName).dll.config" ContinueOnError="true" />
+        <Delete Files="..\..\Distribution\$(AssemblyName).exe" ContinueOnError="true" />
+        <Delete Files="..\..\Distribution\$(AssemblyName).pdb" ContinueOnError="true" />
+        <Delete Files="..\..\Distribution\$(AssemblyName).runtimeconfig.dev.json" ContinueOnError="true" />
+        <Delete Files="..\..\Distribution\$(AssemblyName).runtimeconfig.json" ContinueOnError="true" />
+    </Target>
     <ItemGroup>
-      <ProjectReference Include="..\Server\Server.csproj" />
-      <ProjectReference Include="..\UOContent\UOContent.csproj" Private="false" PrivateAssets="All" IncludeAssets="None">
-          <IncludeInPackage>false</IncludeInPackage>
-      </ProjectReference>
+        <ProjectReference Include="..\Server\Server.csproj" />
+        <ProjectReference Include="..\UOContent\UOContent.csproj" Private="false" PrivateAssets="All" IncludeAssets="None">
+            <IncludeInPackage>false</IncludeInPackage>
+        </ProjectReference>
     </ItemGroup>
 </Project>
diff --git a/Projects/Server/Server.csproj b/Projects/Server/Server.csproj
index 486691d19..91bffdc89 100644
--- a/Projects/Server/Server.csproj
+++ b/Projects/Server/Server.csproj
@@ -3,13 +3,14 @@
     <PropertyGroup>
         <Product>ModernUO Core</Product>
         <OutDir>..\..\Distribution</OutDir>
+        <PublishDir>..\..\Distribution</PublishDir>
         <Version>0.0.0</Version>
         <Configurations>Debug;Release;Analyze</Configurations>
         <RootNamespace>Server</RootNamespace>
         <PackageId>Server</PackageId>
     </PropertyGroup>
     <Target Name="CleanPub" AfterTargets="Clean">
-        <Message Text="Removing distribution files..." />
+        <Message Text="Server: Removing distribution files..." />
         <Delete Files="..\..\Distribution\$(AssemblyName)" ContinueOnError="true" />
         <Delete Files="..\..\Distribution\$(AssemblyName).deps.json" ContinueOnError="true" />
         <Delete Files="..\..\Distribution\$(AssemblyName).dll" ContinueOnError="true" />
diff --git a/Projects/UOContent/UOContent.csproj b/Projects/UOContent/UOContent.csproj
index 880cc8318..cc463c0bd 100644
--- a/Projects/UOContent/UOContent.csproj
+++ b/Projects/UOContent/UOContent.csproj
@@ -5,10 +5,11 @@
         <AssemblyName>UOContent</AssemblyName>
         <Product>ModernUO Content</Product>
         <OutDir>..\..\Distribution\Assemblies</OutDir>
+        <PublishDir>..\..\Distribution\Assemblies</PublishDir>
         <Configurations>Debug;Release;Analyze</Configurations>
     </PropertyGroup>
     <Target Name="CleanPub" AfterTargets="Clean">
-        <Message Text="Removing distribution assemblies..." />
+        <Message Text="UOContent: Removing distribution assemblies..." />
         <Delete Files="..\..\Distribution\Assemblies\Argon2.Bindings.dll" ContinueOnError="true" />
         <Delete Files="..\..\Distribution\Assemblies\libargon2.dll" ContinueOnError="true" />
         <Delete Files="..\..\Distribution\Assemblies\BouncyCastle.Cryptography.dll" ContinueOnError="true" />
diff --git a/publish.cmd b/publish.cmd
index 93f2345ae..f8e490426 100755
--- a/publish.cmd
+++ b/publish.cmd
@@ -39,8 +39,8 @@ dotnet clean --verbosity quiet
 echo dotnet restore --force-evaluate --source https://api.nuget.org/v3/index.json
 dotnet restore --force-evaluate --source https://api.nuget.org/v3/index.json
 
-echo dotnet publish %config% %os%-%arch% --no-restore --self-contained=false -o Distribution Projects\Application\Application.csproj
-dotnet publish %config% %os%-%arch% --no-restore --self-contained=false -o Distribution Projects\Application\Application.csproj
+echo dotnet publish %config% %os%-%arch% --no-restore --self-contained=false
+dotnet publish %config% %os%-%arch% --no-restore --self-contained=false
 
 echo Generating serialization migration schema...
 dotnet tool run ModernUOSchemaGenerator -- ModernUO.sln
diff --git a/publish.sh b/publish.sh
index 72bde37fe..8b6f76f81 100755
--- a/publish.sh
+++ b/publish.sh
@@ -36,8 +36,8 @@ dotnet clean --verbosity quiet
 echo dotnet restore --force-evaluate --source https://api.nuget.org/v3/index.json
 dotnet restore --force-evaluate --source https://api.nuget.org/v3/index.json
 
-echo dotnet publish ${config} ${os}-${arch} --no-restore --self-contained=false -o Distribution Projects/Application/Application.csproj
-dotnet publish ${config} ${os}-${arch} --no-restore --self-contained=false -o Distribution Projects/Application/Application.csproj
+echo dotnet publish ${config} ${os}-${arch} --no-restore --self-contained=false
+dotnet publish ${config} ${os}-${arch} --no-restore --self-contained=false
 
 echo Generating serialization migration schema...
 dotnet tool run ModernUOSchemaGenerator -- ModernUO.sln