diff --git a/CefGlue.BrowserProcess/CefGlue.BrowserProcess.csproj b/CefGlue.BrowserProcess/CefGlue.BrowserProcess.csproj
index 298bf60f..ed73a6ca 100644
--- a/CefGlue.BrowserProcess/CefGlue.BrowserProcess.csproj
+++ b/CefGlue.BrowserProcess/CefGlue.BrowserProcess.csproj
@@ -1,65 +1,68 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <OutputType>WinExe</OutputType>
-    <TargetFramework>$(DotnetVersion)</TargetFramework>
-    <AssemblyName>Xilium.CefGlue.BrowserProcess</AssemblyName>
-    <RootNamespace>Xilium.CefGlue.BrowserProcess</RootNamespace>
-    <RuntimeIdentifiers>osx-x64;osx-arm64;win-x64;win-arm64;linux-x64;linux-arm64</RuntimeIdentifiers>
-    <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <PublishCommonConfig>Configuration=$(Configuration);Platform=$(Platform);TargetFramework=$(TargetFramework);IsPublishing=True;PublishTrimmed=True;SelfContained=True;RuntimeIdentifier=</PublishCommonConfig>
-    <IsEditbinEnabled>True</IsEditbinEnabled>
-  </PropertyGroup>
+    <PropertyGroup>
+        <OutputType>WinExe</OutputType>
+        <TargetFramework>$(DotnetVersion)</TargetFramework>
+        <AssemblyName>Xilium.CefGlue.BrowserProcess</AssemblyName>
+        <RootNamespace>Xilium.CefGlue.BrowserProcess</RootNamespace>
+        <RuntimeIdentifiers>osx-x64;osx-arm64;win-x64;win-arm64;linux-x64;linux-arm64</RuntimeIdentifiers>
+        <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
+        <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+        <PublishCommonConfig>Configuration=$(Configuration);Platform=$(Platform);TargetFramework=$(TargetFramework);IsPublishing=False;RuntimeIdentifier=</PublishCommonConfig>
+        <IsEditbinEnabled>True</IsEditbinEnabled>
+        <RollForward>Major</RollForward>
+    </PropertyGroup>
 
-  <ItemGroup>
-    <None Remove="ObjectBinding\CefGlueGlobalScript.js" />
-  </ItemGroup>
+    <ItemGroup>
+        <None Remove="ObjectBinding\CefGlueGlobalScript.js" />
+    </ItemGroup>
 
-  <ItemGroup>
-    <EmbeddedResource Include="ObjectBinding\CefGlueGlobalScript.js" />
-  </ItemGroup>
+    <ItemGroup>
+        <EmbeddedResource Include="ObjectBinding\CefGlueGlobalScript.js" />
+    </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\CefGlue.Common.Shared\CefGlue.Common.Shared.csproj" />
-    <ProjectReference Include="..\CefGlue\CefGlue.csproj" />
-  </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\CefGlue.Common.Shared\CefGlue.Common.Shared.csproj" />
+        <ProjectReference Include="..\CefGlue\CefGlue.csproj" />
+    </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="System.Runtime.Loader" />
-  </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="System.Runtime.Loader" />
+    </ItemGroup>
 
-  <Target Name="Editbin" AfterTargets="Compile" Condition="$(IsEditbinEnabled) == True And $(VcvarsFile) != '' And $([MSBuild]::IsOSPlatform('Windows'))">
-    <!--
+    <Target Name="Editbin" AfterTargets="Compile" Condition="$(IsEditbinEnabled) == True And $(VcvarsFile) != '' And $([MSBuild]::IsOSPlatform('Windows'))">
+        <!--
       Quick explanation: This target runs after compile, and currently 3 more times for each MSBuild command executed in the next target "PublishApp".
       We just want this target to be executed for windows specs and when passed the VcvarsFile location.
       Using VS Studio: VcvarsFile="$(DevEnvDir)..\..\VC\Auxiliary\Build\vcvars64.bat"
       Using VS Studio tools: VcvarsFile="C:\Program Files\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build\vcvars64.bat"
     -->
 
-    <PropertyGroup>
-      <ApphostLocation>$(ProjectDir)$(BaseIntermediateOutputPath)$(Platform)\$(Configuration)\$(TargetFramework)\</ApphostLocation>
-      <ApphostLocation Condition="'$(IsPublishing)' == 'True'">$(ApphostLocation)$(RuntimeIdentifier)\</ApphostLocation> <!-- When publishing, we also use the runtime identifiers (check the next target "PublishApp") -->
-    </PropertyGroup>
+        <PropertyGroup>
+            <ApphostLocation>$(ProjectDir)$(BaseIntermediateOutputPath)$(Platform)\$(Configuration)\$(TargetFramework)\</ApphostLocation>
+            <ApphostLocation Condition="'$(IsPublishing)' == 'True'">$(ApphostLocation)$(RuntimeIdentifier)\</ApphostLocation>
+            <!-- When publishing, we also use the runtime identifiers (check the next target "PublishApp") -->
+        </PropertyGroup>
 
-    <!--
+        <!--
       This command aims at increasing the stack size of Xilium.CefGlue.BrowserProcess.exe to 8 MiBs, using the visual studio tool "editbin".
       Since we are reaching the .exe at the compile time, the file name is "apphost.exe" instead and located at /obj folder
     -->
-    <Exec Command="call &quot;$(VcvarsFile)&quot;&#xD;&#xA; editbin /STACK:0x800000 &quot;$(ApphostLocation)\apphost.exe&quot;&#xD;&#xA;" />
-  </Target>
+        <Exec Command="call &quot;$(VcvarsFile)&quot;&#xD;&#xA; editbin /STACK:0x800000 &quot;$(ApphostLocation)\apphost.exe&quot;&#xD;&#xA;" />
+    </Target>
+
+    <Target Name="BuildApp" AfterTargets="AfterBuild" Condition="'$(_AssemblyTimestampBeforeCompile)' != '$(_AssemblyTimestampAfterCompile)' and '$(IsPublishing)' != 'False'">
+        <!-- WINDOWS -->
+        <Message Text="Buiding CefGlue.BrowserProcess on Windows ($(Platform))..." Importance="High" />
+        <MSBuild Projects="CefGlue.BrowserProcess.csproj" Targets="Build" Properties="$(PublishCommonConfig)win-$(ArchitectureConfig);IsEditbinEnabled=True;" />
 
-  <Target Name="PublishApp" AfterTargets="AfterBuild" Condition="'$(_AssemblyTimestampBeforeCompile)' != '$(_AssemblyTimestampAfterCompile)' and '$(IsPublishing)' != 'True'">
-    <!-- WINDOWS -->
-    <Message Text="Publishing CefGlue.BrowserProcess on Windows ($(Platform))..." Importance="High" />
-    <MSBuild Projects="CefGlue.BrowserProcess.csproj" Targets="Publish" Properties="$(PublishCommonConfig)win-$(ArchitectureConfig);IsEditbinEnabled=True;" />
+        <!-- LINUX -->
+        <Message Text="Buiding CefGlue.BrowserProcess on Linux ($(Platform))..." Importance="High" />
+        <MSBuild Projects="CefGlue.BrowserProcess.csproj" Targets="Build" Properties="$(PublishCommonConfig)linux-$(ArchitectureConfig);IsEditbinEnabled=False;" />
 
-    <!-- LINUX -->
-    <Message Text="Publishing CefGlue.BrowserProcess on Linux ($(Platform))..." Importance="High" />
-    <MSBuild Projects="CefGlue.BrowserProcess.csproj" Targets="Publish" Properties="$(PublishCommonConfig)linux-$(ArchitectureConfig);IsEditbinEnabled=False;" />
+        <!-- OSX -->
+        <Message Text="Buiding CefGlue.BrowserProcess on MacOS ($(Platform))..." Importance="High" />
+        <MSBuild Projects="CefGlue.BrowserProcess.csproj" Targets="Build" Properties="$(PublishCommonConfig)osx-$(ArchitectureConfig);IsEditbinEnabled=False;" />
+    </Target>
 
-    <!-- OSX -->
-    <Message Text="Publishing CefGlue.BrowserProcess on MacOS ($(Platform))..." Importance="High" />
-    <MSBuild Projects="CefGlue.BrowserProcess.csproj" Targets="Publish" Properties="$(PublishCommonConfig)osx-$(ArchitectureConfig);IsEditbinEnabled=False;" />
-  </Target>
 </Project>
diff --git a/CefGlue.Common.Shared/CefGlue.Common.Shared.csproj b/CefGlue.Common.Shared/CefGlue.Common.Shared.csproj
index 4b4ae342..8470550a 100644
--- a/CefGlue.Common.Shared/CefGlue.Common.Shared.csproj
+++ b/CefGlue.Common.Shared/CefGlue.Common.Shared.csproj
@@ -10,8 +10,4 @@
     <ProjectReference Include="..\CefGlue\CefGlue.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="System.Text.Json" />
-  </ItemGroup>
-
 </Project>
diff --git a/CefGlue.Common/CefGlue.Common.csproj b/CefGlue.Common/CefGlue.Common.csproj
index 8af70f78..cc81baa9 100644
--- a/CefGlue.Common/CefGlue.Common.csproj
+++ b/CefGlue.Common/CefGlue.Common.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <Import Project="..\CefGlue.Packages.props" />
-    
+
     <PropertyGroup>
         <TargetFramework>$(DotnetVersion)</TargetFramework>
         <AssemblyName>Xilium.CefGlue.Common</AssemblyName>
@@ -21,10 +21,6 @@
         <None Include="BaseCefBrowser.cs" />
     </ItemGroup>
 
-    <ItemGroup>
-        <PackageReference Include="System.Text.Json" />
-    </ItemGroup>
-
     <ItemGroup Condition="$([System.Text.RegularExpressions.Regex]::IsMatch($(DefineConstants), '(^|;)HAS_NLOG($|;)'))">
         <PackageReference Include="NLog" />
     </ItemGroup>
@@ -40,12 +36,6 @@
             <IncludeAssets>CefGlue.dll</IncludeAssets>
         </ProjectReference>
 
-        <!-- Forces BrowserProcess build before CopyProjectReferencesToPackage target run -->
-        <ProjectReference Include="..\CefGlue.BrowserProcess\CefGlue.BrowserProcess.csproj">
-            <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-            <PrivateAssets>all</PrivateAssets>
-        </ProjectReference>
-
         <None Include="build\CefGlue.Common.props" Pack="True" PackagePath="build\CefGlue.Common$(PackageSuffix).props" />
         <None Include="build\CefGlue.Common.targets" Pack="True" PackagePath="build\CefGlue.Common$(PackageSuffix).targets" />
         <None Include="build\CefGlue.Common.props" Pack="True" PackagePath="buildTransitive\CefGlue.Common$(PackageSuffix).props" />
@@ -56,16 +46,16 @@
         <ItemGroup>
             <BuildOutputInPackage Include="@(ReferenceCopyLocalPaths-&gt;WithMetadataValue('ReferenceSourceTarget', 'ProjectReference'))" />
 
-            <TfmSpecificPackageFile Include="..\CefGlue.BrowserProcess\bin\$(Platform)\$(Configuration)\$(DotnetVersion)\win-$(ArchitectureConfig)\publish\**\*">
-                <PackagePath>bin\win-$(ArchitectureConfig)</PackagePath>
+            <TfmSpecificPackageFile Include="..\CefGlue.BrowserProcess\bin\$(Platform)\$(Configuration)\$(DotnetVersion)\win-$(ArchitectureConfig)\Xilium.CefGlue.BrowserProcess.*">
+                <PackagePath>runtimes\win-$(ArchitectureConfig)\native</PackagePath>
             </TfmSpecificPackageFile>
-            
-            <TfmSpecificPackageFile Include="..\CefGlue.BrowserProcess\bin\$(Platform)\$(Configuration)\$(DotnetVersion)\linux-$(ArchitectureConfig)\publish\**\*">
-                <PackagePath>bin\linux-$(ArchitectureConfig)</PackagePath>
+
+            <TfmSpecificPackageFile Include="..\CefGlue.BrowserProcess\bin\$(Platform)\$(Configuration)\$(DotnetVersion)\linux-$(ArchitectureConfig)\Xilium.CefGlue.BrowserProcess.*">
+                <PackagePath>runtimes\linux-$(ArchitectureConfig)\native</PackagePath>
             </TfmSpecificPackageFile>
 
-            <TfmSpecificPackageFile Include="..\CefGlue.BrowserProcess\bin\$(Platform)\$(Configuration)\$(DotnetVersion)\osx-$(ArchitectureConfig)\publish\**\*">
-                <PackagePath>bin\osx-$(ArchitectureConfig)</PackagePath>
+            <TfmSpecificPackageFile Include="..\CefGlue.BrowserProcess\bin\$(Platform)\$(Configuration)\$(DotnetVersion)\osx-$(ArchitectureConfig)\Xilium.CefGlue.BrowserProcess.*">
+                <PackagePath>runtimes\osx-$(ArchitectureConfig)\native</PackagePath>
             </TfmSpecificPackageFile>
         </ItemGroup>
     </Target>
diff --git a/CefGlue.Common/CefRuntimeLoader.cs b/CefGlue.Common/CefRuntimeLoader.cs
index 5f7e9d25..c64efd25 100644
--- a/CefGlue.Common/CefRuntimeLoader.cs
+++ b/CefGlue.Common/CefRuntimeLoader.cs
@@ -6,13 +6,12 @@
 using System.Reflection;
 using Xilium.CefGlue.Common.Handlers;
 using Xilium.CefGlue.Common.Shared;
+using System.Runtime.InteropServices;
 
 namespace Xilium.CefGlue.Common
 {
     public static class CefRuntimeLoader
     {
-        private const string DefaultBrowserProcessDirectory = "CefGlueBrowserProcess";
-
         private static Action<BrowserProcessHandler> _delayedInitialization;
 
         public static void Initialize(CefSettings settings = null, KeyValuePair<string, string>[] flags = null, CustomScheme[] customSchemes = null)
@@ -90,12 +89,12 @@ private static void InternalInitialize(CefSettings settings = null, KeyValuePair
 
         private static IEnumerable<string> GetSubProcessPaths(string baseDirectory)
         {
-            yield return Path.Combine(baseDirectory, DefaultBrowserProcessDirectory, BrowserProcessFileName);
+            yield return Path.Combine(baseDirectory, $"runtimes/{RuntimeInformation.RuntimeIdentifier}/native", BrowserProcessFileName);
             yield return Path.Combine(baseDirectory, BrowserProcessFileName);
 
             // The executing DLL might not be in the current domain directory (plugins scenario)
             baseDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
-            yield return Path.Combine(baseDirectory, DefaultBrowserProcessDirectory, BrowserProcessFileName);
+            yield return Path.Combine(baseDirectory, $"runtimes/{RuntimeInformation.RuntimeIdentifier}/native", BrowserProcessFileName);
             yield return Path.Combine(baseDirectory, BrowserProcessFileName);
         }
 
diff --git a/CefGlue.Common/build/CefGlue.Common.props b/CefGlue.Common/build/CefGlue.Common.props
index c59a49d0..f6cb1039 100644
--- a/CefGlue.Common/build/CefGlue.Common.props
+++ b/CefGlue.Common/build/CefGlue.Common.props
@@ -3,30 +3,44 @@
         <!-- adding the supported indentifiers to make bundle work properly -->
         <RuntimeIdentifiers>osx-x64;osx-arm64;win-x64;win-arm64;linux-x64;linux-arm64</RuntimeIdentifiers>
     </PropertyGroup>
-    
+
     <PropertyGroup Condition="'$(RuntimeIdentifier)' == '' and $([MSBuild]::IsOSPlatform('Windows'))">
         <CefGlueTargetPlatform Condition="'$(Platform)' == 'x64'">win-x64</CefGlueTargetPlatform>
         <CefGlueTargetPlatform Condition="'$(Platform)' == 'ARM64'">win-arm64</CefGlueTargetPlatform>
-        <CefGlueTargetPlatform Condition="'$(CefGlueTargetPlatform)' == ''">win-x64</CefGlueTargetPlatform> <!-- fallback -->
+        <CefGlueTargetPlatform Condition="'$(CefGlueTargetPlatform)' == ''">win-x64</CefGlueTargetPlatform>
+        <!-- fallback -->
     </PropertyGroup>
 
     <PropertyGroup Condition="'$(RuntimeIdentifier)' == '' and $([MSBuild]::IsOSPlatform('Linux'))">
         <CefGlueTargetPlatform Condition="'$(Platform)' == 'x64'">linux-x64</CefGlueTargetPlatform>
         <CefGlueTargetPlatform Condition="'$(Platform)' == 'ARM64'">linux-arm64</CefGlueTargetPlatform>
-        <CefGlueTargetPlatform Condition="'$(CefGlueTargetPlatform)' == ''">linux-x64</CefGlueTargetPlatform> <!-- fallback -->
+        <CefGlueTargetPlatform Condition="'$(CefGlueTargetPlatform)' == ''">linux-x64</CefGlueTargetPlatform>
+        <!-- fallback -->
     </PropertyGroup>
-    
+
     <PropertyGroup Condition="'$(RuntimeIdentifier)' == '' and $([MSBuild]::IsOSPlatform('OSX'))">
         <CefGlueTargetPlatform Condition="'$(Platform)' == 'x64'">osx-x64</CefGlueTargetPlatform>
         <CefGlueTargetPlatform Condition="'$(Platform)' == 'ARM64'">osx-arm64</CefGlueTargetPlatform>
-        <CefGlueTargetPlatform Condition="'$(CefGlueTargetPlatform)' == ''">osx-arm64</CefGlueTargetPlatform> <!-- fallback -->
+        <CefGlueTargetPlatform Condition="'$(CefGlueTargetPlatform)' == ''">osx-arm64</CefGlueTargetPlatform>
+        <!-- fallback -->
     </PropertyGroup>
-    
+
     <PropertyGroup Condition="'$(RuntimeIdentifier)' != ''">
         <CefGlueTargetPlatform>$(RuntimeIdentifier)</CefGlueTargetPlatform>
     </PropertyGroup>
 
-    <ItemGroup Condition="'$(CefGlueTargetPlatform)' != ''">
-        <CefGlueBrowserProcessFiles Include="$(MSBuildThisFileDirectory)..\bin\$(CefGlueTargetPlatform)\*" />
+    <!-- copy lib to run BrowserProcess -->
+    <ItemGroup Condition="'$(RuntimeIdentifier)' == ''">
+        <None Include="$(MSBuildThisFileDirectory)..\lib\net8.0\Xilium.CefGlue.dll">
+            <Link>$(CefGlueBrowserProcessRuntimeDirectory)\%(RecursiveDir)%(FileName)%(Extension)</Link>
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+            <Visible>false</Visible>
+        </None>
+        <None Include="$(MSBuildThisFileDirectory)..\lib\net8.0\Xilium.CefGlue.Common.Shared.dll">
+            <Link>$(CefGlueBrowserProcessRuntimeDirectory)%(RecursiveDir)%(FileName)%(Extension)</Link>
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+            <Visible>false</Visible>
+        </None>
     </ItemGroup>
-</Project>
+
+</Project>
\ No newline at end of file
diff --git a/CefGlue.Common/build/CefGlue.Common.targets b/CefGlue.Common/build/CefGlue.Common.targets
index bfdcecb3..73bfba0a 100644
--- a/CefGlue.Common/build/CefGlue.Common.targets
+++ b/CefGlue.Common/build/CefGlue.Common.targets
@@ -1,40 +1,44 @@
 <Project>
-    <PropertyGroup>
-        <CefGlueBrowserProcessDir>CefGlueBrowserProcess</CefGlueBrowserProcessDir>
+    <!-- define CefGlueBrowserProcessRuntimeDirectory to copy browserprocess runtime files-->
+    <PropertyGroup Condition="'$(RuntimeIdentifier)' == ''">
+        <CefGlueBrowserProcessRuntimeDirectory>runtimes\$(CefGlueTargetPlatform)\native\</CefGlueBrowserProcessRuntimeDirectory>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(RuntimeIdentifier)' != ''">
+        <CefGlueBrowserProcessRuntimeDirectory>$(OutputDirectory)\</CefGlueBrowserProcessRuntimeDirectory>
     </PropertyGroup>
 
     <ItemGroup Condition="'$(CefGlueTargetPlatform)' == 'osx-x64' OR '$(CefGlueTargetPlatform)' == 'osx-arm64'">
         <None Condition="'$(CefGlueTargetPlatform)' == 'osx-x64'" Include="@(CefRedistOSX64)">
             <Visible>false</Visible>
-            <Link>$(OutputDirectory)%(RecursiveDir)%(FileName)%(Extension)</Link>
+            <Link>$(CefGlueBrowserProcessRuntimeDirectory)%(RecursiveDir)%(FileName)%(Extension)</Link>
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
             <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
             <PublishState>Included</PublishState>
         </None>
         <None Condition="'$(CefGlueTargetPlatform)' == 'osx-arm64'" Include="@(CefRedistOSXARM64)">
             <Visible>false</Visible>
-            <Link>$(OutputDirectory)%(RecursiveDir)%(FileName)%(Extension)</Link>
+            <Link>$(CefGlueBrowserProcessRuntimeDirectory)%(RecursiveDir)%(FileName)%(Extension)</Link>
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
             <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
             <PublishState>Included</PublishState>
         </None>
         <None Include="$(OutDir)\libEGL.dylib">
             <Visible>false</Visible>
-            <Link>$(OutputDirectory)$(CefGlueBrowserProcessDir)\%(RecursiveDir)%(FileName)%(Extension)</Link>
+            <Link>$(CefGlueBrowserProcessRuntimeDirectory)%(RecursiveDir)%(FileName)%(Extension)</Link>
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
             <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
             <PublishState>Included</PublishState>
         </None>
         <None Include="$(OutDir)\libGLESv2.dylib">
             <Visible>false</Visible>
-            <Link>$(OutputDirectory)$(CefGlueBrowserProcessDir)\%(RecursiveDir)%(FileName)%(Extension)</Link>
+            <Link>$(CefGlueBrowserProcessRuntimeDirectory)%(RecursiveDir)%(FileName)%(Extension)</Link>
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
             <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
             <PublishState>Included</PublishState>
         </None>
         <None Include="$(OutDir)\libvk_swiftshader.dylib">
             <Visible>false</Visible>
-            <Link>$(OutputDirectory)$(CefGlueBrowserProcessDir)\%(RecursiveDir)%(FileName)%(Extension)</Link>
+            <Link>$(CefGlueBrowserProcessRuntimeDirectory)%(RecursiveDir)%(FileName)%(Extension)</Link>
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
             <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
             <PublishState>Included</PublishState>
@@ -44,58 +48,44 @@
     <ItemGroup Condition="'$(CefGlueTargetPlatform)' == 'linux-x64' OR '$(CefGlueTargetPlatform)' == 'linux-arm64'">
         <None Condition="'$(CefGlueTargetPlatform)' == 'linux-x64'" Include="@(CefRedistLinux64)">
             <Visible>false</Visible>
-            <Link>$(OutputDirectory)$(CefGlueBrowserProcessDir)\%(RecursiveDir)%(FileName)%(Extension)</Link>
+            <Link>$(CefGlueBrowserProcessRuntimeDirectory)%(RecursiveDir)%(FileName)%(Extension)</Link>
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
             <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
             <PublishState>Included</PublishState>
         </None>
         <None Condition="'$(CefGlueTargetPlatform)' == 'linux-arm64'" Include="@(CefRedistLinuxARM64)">
             <Visible>false</Visible>
-            <Link>$(OutputDirectory)$(CefGlueBrowserProcessDir)\%(RecursiveDir)%(FileName)%(Extension)</Link>
+            <Link>$(CefGlueBrowserProcessRuntimeDirectory)%(RecursiveDir)%(FileName)%(Extension)</Link>
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
             <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
             <PublishState>Included</PublishState>
         </None>
     </ItemGroup>
 
-    <ItemGroup>
-        <None Include="@(CefGlueBrowserProcessFiles)">
+    <ItemGroup Condition="'$(CefGlueTargetPlatform)' == 'win-x64' OR '$(CefGlueTargetPlatform)' == 'win-arm64'">
+        <None Condition="'$(CefGlueTargetPlatform)' == 'win-x64'" Include="@(CefRuntimeWin64Locales)">
             <Visible>false</Visible>
-            <Link>$(OutputDirectory)$(CefGlueBrowserProcessDir)\%(RecursiveDir)%(FileName)%(Extension)</Link>
+            <Link>$(CefGlueBrowserProcessRuntimeDirectory)locales\%(RecursiveDir)%(FileName)%(Extension)</Link>
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+            <PublishState>Included</PublishState>
+        </None>
+        <None Condition="'$(CefGlueTargetPlatform)' == 'win-arm64'" Include="@(CefRuntimeWinArm64Locales)">
+            <Visible>false</Visible>
+            <Link>$(CefGlueBrowserProcessRuntimeDirectory)locales\%(RecursiveDir)%(FileName)%(Extension)</Link>
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-            <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
             <PublishState>Included</PublishState>
         </None>
     </ItemGroup>
 
-    <!-- Copy CEF resources from 'chromiumembeddedframework.runtime.<architecture>' dependency package
-     to the root folder of the build output directory. It is only applicable when compiling in Windows OS. 
-     Relies on ResolvePackageAssets MSBuild target to identify resources deployed from that specific package. -->
-    <Target Name="ResolveCEFAssets" Condition="$([MSBuild]::IsOSPlatform('Windows')) and '$(CefGlueTargetPlatform)' != ''" AfterTargets="ResolvePackageAssets">
-        <ItemGroup Condition="'$(CefGlueTargetPlatform)' == 'win-x64' OR '$(CefGlueTargetPlatform)' == 'win-arm64'">
-            <CefRuntimeFiles Include="@(RuntimeTargetsCopyLocalItems->WithMetadataValue('NuGetPackageId', 'chromiumembeddedframework.runtime.$(CefGlueTargetPlatform)'))" />
-            <None Include="@(CefRuntimeFiles)">
-                <Visible>false</Visible>
-                <Link>$(OutputDirectory)%(FileName)%(Extension)</Link>
-                <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-                <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-                <PublishState>Included</PublishState>
-            </None>
-        </ItemGroup>
-    
+    <ItemGroup>
+        <_CefGlueBrowserProcessFiles Include="$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\runtimes\$(CefGlueTargetPlatform)\native\Xilium.CefGlue.BrowserProcess.deps.json'))"/>
+        <_CefGlueBrowserProcessFiles Include="$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\runtimes\$(CefGlueTargetPlatform)\native\Xilium.CefGlue.BrowserProcess.runtimeconfig.json'))"/>
+    </ItemGroup>
+
+    <Target Name="ExcludeBrowserProcessRuntimeConfigAfterComputeFilesToPublish" AfterTargets="ComputeFilesToPublish" Condition="'$(CefGlueTargetPlatform)' != '' AND '$(SelfContained)' == 'true'">
         <ItemGroup>
-            <None Include="@(CefRuntimeWin64Locales)" Condition="'$(CefGlueTargetPlatform)' == 'win-x64'">
-                <Visible>false</Visible>
-                <Link>runtimes\win-x64\native\locales\%(RecursiveDir)%(FileName)%(Extension)</Link>
-                <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-                <PublishState>Included</PublishState>
-            </None>
-            <None Include="@(CefRuntimeWinArm64Locales)"  Condition="'$(CefGlueTargetPlatform)' == 'win-arm64'">
-                <Visible>false</Visible>
-                <Link>runtimes\win-arm64\native\locales\%(RecursiveDir)%(FileName)%(Extension)</Link>
-                <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-                <PublishState>Included</PublishState>
-            </None>
+            <ResolvedFileToPublish Remove="@(_CefGlueBrowserProcessFiles)" />
         </ItemGroup>
     </Target>
+
 </Project>
diff --git a/CefGlue.CopyLocal.props b/CefGlue.CopyLocal.props
index 7c31b9b1..d2df676a 100644
--- a/CefGlue.CopyLocal.props
+++ b/CefGlue.CopyLocal.props
@@ -11,7 +11,7 @@
         <CefGlueTargetPlatform Condition="'$(Platform)' == 'x64'">linux-x64</CefGlueTargetPlatform>
         <CefGlueTargetPlatform Condition="'$(Platform)' == 'ARM64'">linux-arm64</CefGlueTargetPlatform>
     </PropertyGroup>
-    
+
     <PropertyGroup Condition="$([MSBuild]::IsOSPlatform('OSX'))">
         <CefGlueTargetPlatform Condition="'$(Platform)' == 'x64'">osx-x64</CefGlueTargetPlatform>
         <CefGlueTargetPlatform Condition="'$(Platform)' == 'ARM64'">osx-arm64</CefGlueTargetPlatform>
@@ -22,12 +22,15 @@
         <RuntimeIdentifiers>osx-x64;osx-arm64;win-x64;win-arm64;linux-x64;linux-arm64</RuntimeIdentifiers>
     </PropertyGroup>
 
-    <ItemGroup Condition="'$(RuntimeIdentifier)' == ''">
-        <CefGlueBrowserProcessFiles
-            Include="$(BrowserProcessDir)\$(CefGlueTargetPlatform)\publish\*" />
+    <ItemGroup>
+        <CefGlueBrowserProcessFiles Include="$(BrowserProcessDir)\Xilium.CefGlue.*" />
     </ItemGroup>
 
-    <ItemGroup Condition="'$(RuntimeIdentifier)' != ''">
-        <CefGlueBrowserProcessFiles Include="$(BrowserProcessDir)\$(RuntimeIdentifier)\publish\*" />
+    <ItemGroup>
+        <None Include="@(CefGlueBrowserProcessFiles)">
+            <Visible>false</Visible>
+            <Link>$(OutputDirectory)runtimes\$(CefGlueTargetPlatform)\native\%(RecursiveDir)%(FileName)%(Extension)</Link>
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
     </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Directory.Build.props b/Directory.Build.props
index 4db07904..a00b9b02 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -46,4 +46,4 @@
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
     </PropertyGroup>
 
-</Project>
+</Project>
\ No newline at end of file