diff --git a/Akka.MultiNodeTestRunner.sln b/Akka.MultiNodeTestRunner.sln
index 43258fd..c7bd511 100644
--- a/Akka.MultiNodeTestRunner.sln
+++ b/Akka.MultiNodeTestRunner.sln
@@ -9,6 +9,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{79D71264
 		build.fsx = build.fsx
 		build.ps1 = build.ps1
 		build.sh = build.sh
+		README.md = README.md
+		RELEASE_NOTES.md = RELEASE_NOTES.md
+		src\Directory.Build.props = src\Directory.Build.props
+		src\Directory.Packages.props = src\Directory.Packages.props
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Akka.MultiNode.TestAdapter", "src\Akka.MultiNode.TestAdapter\Akka.MultiNode.TestAdapter.csproj", "{F3037C62-E780-4619-89B3-BA21C7168DFA}"
@@ -19,6 +23,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Akka.MultiNode.TestAdapter.
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Akka.MultiNode.RemoteHost", "src\Akka.MultiNode.RemoteHost\Akka.MultiNode.RemoteHost.csproj", "{D59D10BA-E776-4AC6-B8F0-BAB40544439C}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build-system", "build-system", "{C7DE41DA-ADDE-498E-95DB-D760C32D3C6B}"
+	ProjectSection(SolutionItems) = preProject
+		build-system\azure-pipeline.template.yaml = build-system\azure-pipeline.template.yaml
+		build-system\pr-validation.yaml = build-system\pr-validation.yaml
+		build-system\README.md = build-system\README.md
+		build-system\windows-release.yaml = build-system\windows-release.yaml
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -48,4 +60,7 @@ Global
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {B99E6BB8-642A-4A68-86DF-69567CBA700A}
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{C7DE41DA-ADDE-498E-95DB-D760C32D3C6B} = {79D71264-186B-4F62-8930-35DD9ECCAF3B}
+	EndGlobalSection
 EndGlobal
diff --git a/build.fsx b/build.fsx
index 9fd488e..821b964 100644
--- a/build.fsx
+++ b/build.fsx
@@ -64,8 +64,8 @@ Target "Clean" (fun _ ->
 )
 
 Target "AssemblyInfo" (fun _ ->
-    XmlPokeInnerText "./src/common.props" "//Project/PropertyGroup/VersionPrefix" releaseNotes.AssemblyVersion    
-    XmlPokeInnerText "./src/common.props" "//Project/PropertyGroup/PackageReleaseNotes" (releaseNotes.Notes |> String.concat "\n")
+    XmlPokeInnerText "./src/Directory.Build.props" "//Project/PropertyGroup/VersionPrefix" releaseNotes.AssemblyVersion    
+    XmlPokeInnerText "./src/Directory.Build.props" "//Project/PropertyGroup/PackageReleaseNotes" (releaseNotes.Notes |> String.concat "\n")
 )
 
 Target "Build" (fun _ ->
diff --git a/docs/images/icon.png b/docs/images/icon.png
index 86698cd..c0f0ca9 100644
Binary files a/docs/images/icon.png and b/docs/images/icon.png differ
diff --git a/src/Akka.MultiNode.RemoteHost/Akka.MultiNode.RemoteHost.csproj b/src/Akka.MultiNode.RemoteHost/Akka.MultiNode.RemoteHost.csproj
index dcfd969..4364f47 100644
--- a/src/Akka.MultiNode.RemoteHost/Akka.MultiNode.RemoteHost.csproj
+++ b/src/Akka.MultiNode.RemoteHost/Akka.MultiNode.RemoteHost.csproj
@@ -1,10 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <Import Project="..\common.props" />
-    
     <PropertyGroup>
         <OutputType>Exe</OutputType>
         <TargetFramework>$(NetStandardLibVersion)</TargetFramework>
-        <LangVersion>8</LangVersion>
         <IsPackable>false</IsPackable>
     </PropertyGroup>
     
diff --git a/src/Akka.MultiNode.SampleMultiNodeTests/Akka.MultiNode.SampleMultiNodeTests.csproj b/src/Akka.MultiNode.SampleMultiNodeTests/Akka.MultiNode.SampleMultiNodeTests.csproj
index fe23d8c..cebc144 100644
--- a/src/Akka.MultiNode.SampleMultiNodeTests/Akka.MultiNode.SampleMultiNodeTests.csproj
+++ b/src/Akka.MultiNode.SampleMultiNodeTests/Akka.MultiNode.SampleMultiNodeTests.csproj
@@ -1,13 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <Import Project="..\common.props" />
-
     <PropertyGroup>
         <TargetFrameworks>$(NetCoreTestVersion);$(NetTestVersion)</TargetFrameworks>
+        <IsPackable>false</IsPackable>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Akka.Cluster.TestKit" Version="$(AkkaVersion)" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
+        <PackageReference Include="Akka.Cluster.TestKit" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/Akka.MultiNode.TestAdapter.Tests/Akka.MultiNode.TestAdapter.Tests.csproj b/src/Akka.MultiNode.TestAdapter.Tests/Akka.MultiNode.TestAdapter.Tests.csproj
index d081109..3854d38 100644
--- a/src/Akka.MultiNode.TestAdapter.Tests/Akka.MultiNode.TestAdapter.Tests.csproj
+++ b/src/Akka.MultiNode.TestAdapter.Tests/Akka.MultiNode.TestAdapter.Tests.csproj
@@ -1,17 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <Import Project="..\common.props" />
-
     <PropertyGroup>
         <TargetFrameworks>$(NetCoreTestVersion);$(NetTestVersion)</TargetFrameworks>
         <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
+        <IsPackable>false</IsPackable>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
-        <PackageReference Include="xunit" Version="$(XunitVersion)" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVersion)" />
-        <PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
-        <PackageReference Include="xunit.runner.utility" Version="$(XunitVersion)" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" />
+        <PackageReference Include="xunit" />
+        <PackageReference Include="xunit.runner.visualstudio" />
+        <PackageReference Include="FluentAssertions" />
+        <PackageReference Include="xunit.runner.utility" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/Akka.MultiNode.TestAdapter/Akka.MultiNode.TestAdapter.csproj b/src/Akka.MultiNode.TestAdapter/Akka.MultiNode.TestAdapter.csproj
index 4233716..d037342 100644
--- a/src/Akka.MultiNode.TestAdapter/Akka.MultiNode.TestAdapter.csproj
+++ b/src/Akka.MultiNode.TestAdapter/Akka.MultiNode.TestAdapter.csproj
@@ -1,12 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\common.props" />
-
   <PropertyGroup>
     <Description>Visual Studio 2017 15.9+ Test Explorer runner for the Akka.NET MultiNode tests</Description>
     <TargetFramework>$(NetStandardLibVersion)</TargetFramework>
     <IncludeSource>true</IncludeSource>
     <IncludeSymbols>true</IncludeSymbols>
-    <LangVersion>8.0</LangVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
@@ -14,11 +11,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Akka.Cluster.TestKit" Version="$(AkkaVersion)" />
-    <PackageReference Include="TeamCity.ServiceMessages" Version="$(TeamCityVersion)" />
-    <PackageReference Include="System.CodeDom" Version="$(CodeDomVersion)" />
-    <PackageReference Include="System.Runtime.Loader" Version="$(SystemRuntimeLoaderVersion)" />
-    <PackageReference Include="xunit.runner.utility" Version="$(XunitVersion)" />
+    <PackageReference Include="Akka.Cluster.TestKit" />
+    <PackageReference Include="TeamCity.ServiceMessages" />
+    <PackageReference Include="System.CodeDom" />
+    <PackageReference Include="System.Runtime.Loader" />
+    <PackageReference Include="xunit.runner.utility" />
   </ItemGroup>
 
   <ItemGroup>
@@ -60,18 +57,4 @@
       <BuildOutputInPackage Include="$(OutputPath)xunit.runner.utility.netstandard15.dll" />
     </ItemGroup>
   </Target>
-  <!--
-  <ItemGroup>
-    <Compile Include="**\*.cs" Exclude="Internal\Persistence\VisualizerRuntimeTemplate.cs" />
-    <Compile Include="Internal\Persistence\VisualizerRuntimeTemplate.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>VisualizerRuntimeTemplate.tt</DependentUpon>
-    </Compile>
-    <Content Include="Internal\Persistence\VisualizerRuntimeTemplate.tt">
-      <Generator>TextTemplatingFilePreprocessor</Generator>
-      <LastGenOutput>VisualizerRuntimeTemplate.cs</LastGenOutput>
-    </Content>
-  </ItemGroup>
-  -->
 </Project>
diff --git a/src/Akka.MultiNode.TestAdapter/Akka.MultiNode.TestAdapter.nuspec.template b/src/Akka.MultiNode.TestAdapter/Akka.MultiNode.TestAdapter.nuspec.template
index 8d161ad..49545c7 100644
--- a/src/Akka.MultiNode.TestAdapter/Akka.MultiNode.TestAdapter.nuspec.template
+++ b/src/Akka.MultiNode.TestAdapter/Akka.MultiNode.TestAdapter.nuspec.template
@@ -11,7 +11,7 @@
     <projectUrl>https://github.com/akkadotnet/akka.net</projectUrl>
     <iconUrl>http://getakka.net/images/AkkaNetLogo.Normal.png</iconUrl>
     <description>Akka.NET Multi-node Test Adapter; used for executing tests written with Akka.Remote.TestKit</description>
-    <copyright>Copyright � 2013-2021 .NET Foundation</copyright>
+    <copyright>Copyright � 2013-2023 .NET Foundation</copyright>
     <tags>akka actors actor model Akka concurrency</tags>
   </metadata>
   <files>
diff --git a/src/Akka.MultiNode.TestAdapter/Internal/Persistence/VisualizerRuntimeTemplate.cs b/src/Akka.MultiNode.TestAdapter/Internal/Persistence/VisualizerRuntimeTemplate.cs
index 4487007..8e3f6e9 100644
--- a/src/Akka.MultiNode.TestAdapter/Internal/Persistence/VisualizerRuntimeTemplate.cs
+++ b/src/Akka.MultiNode.TestAdapter/Internal/Persistence/VisualizerRuntimeTemplate.cs
@@ -28,117 +28,65 @@ public partial class VisualizerRuntimeTemplate : VisualizerRuntimeTemplateBase
         /// </summary>
         public virtual string TransformText()
         {
-            this.Write("\r\n<html>\r\n<head>\r\n\t<script src=\"https://cdnjs.cloudflare.com/ajax/libs/vis/4.8.1/" +
-                    "vis.min.js\"></script>\r\n\t<link href=\"https://cdnjs.cloudflare.com/ajax/libs/vis/4" +
-                    ".8.1/vis.min.css\" rel=\"stylesheet\" type=\"text/css\" />\r\n\t<style type=\"text/css\">\r" +
-                    "\n\t\t.vis-item-one { border-color:#00AABF; background-color:#7FD4DF; }\r\n\t\t.vis-ite" +
-                    "m-two { border-color:#0D9DBC; background-color:#86CEDD; }\r\n\t\t.vis-item-three { b" +
-                    "order-color:#1B91B9; background-color:#8DC8DC; }\r\n\t\t.vis-item-four { border-colo" +
-                    "r:#2885B6; background-color:#93C2DA; }\r\n\t\t.vis-item-five { border-color:#3679B3;" +
-                    " background-color:#9ABCD9; }\r\n\t\t.vis-item-six { border-color:#446DB0; background" +
-                    "-color:#A1B6D7; }\r\n\t\t.vis-item-seven { border-color:#5161AD; background-color:#A" +
-                    "8B0D6; }\r\n\t\t.vis-item-eight { border-color:#5F55AB; background-color:#AFAAD5; }\r" +
-                    "\n\t\t.vis-item-nine { border-color:#6D48A8; background-color:#B6A3D3; }\r\n\t\t.vis-it" +
-                    "em-ten { border-color:#7A3CA5; background-color:#BC9DD2; }\r\n\t\t.vis-item-eleven {" +
-                    " border-color:#8830A2; background-color:#C397D0; }\r\n\t\t.vis-item-twelve { border-" +
-                    "color:#96249F; background-color:#CA91CF; }\r\n\t\t.vis-item-thirteen { border-color:" +
-                    "#A3189C; background-color:#D18BCD; }\r\n\t\t.vis-item-fourteen { border-color:#B10C9" +
-                    "9; background-color:#D885CC; }\r\n\t\t.vis-item-fifteen { border-color:#BF0097; back" +
-                    "ground-color:#DF7FCB; }\r\n\t\tdiv.cross-image {\r\n\t\t\twidth:            16px;\r\n\t\t\thei" +
-                    "ght:           16px;\r\n\t\t\tbackground-image: url(\'data:image/png;base64,iVBORw0KGg" +
-                    "oAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQW" +
-                    "RvYmUgSW1hZ2VSZWFkeXHJZTwAAAIhSURBVDjLlZPrThNRFIWJicmJz6BWiYbIkYDEG0JbBiitDQgm0P" +
-                    "uFXqSAtKXtpE2hNuoPTXwSnwtExd6w0pl2OtPlrphKLSXhx07OZM769qy19wwAGLhM1ddC184+d18QMz" +
-                    "oq3lfsD3LZ7Y3XbE5DL6Atzuyilc5Ciyd7IHVfgNcDYTQ2tvDr5crn6uLSvX+Av2Lk36FFpSVENDe3Ox" +
-                    "DZu8apO5rROJDLo30+Nlvj5RnTlVNAKs1aCVFr7b4BPn6Cls21AWgEQlz2+Dl1h7IdA+i97A/geP65Wh" +
-                    "bmrnZZ0GIJpr6OqZqYAd5/gJpKox4Mg7pD2YoC2b0/54rJQuJZdm6Izcgma4TW1WZ0h+y8BfbyJMwBmS" +
-                    "xkjw+VObNanp5h/adwGhaTXF4NWbLj9gEONyCmUZmd10pGgf1/vwcgOT3tUQE0DdicwIod2EmSbwsKE1" +
-                    "P8QoDkcHPJ5YESjgBJkYQpIEZ2KEB51Y6y3ojvY+P8XEDN7uKS0w0ltA7QGCWHCxSWWpwyaCeLy0BkA7" +
-                    "UXyyg8fIzDoWHeBaDN4tQdSvAVdU1Aok+nsNTipIEVnkywo/FHatVkBoIhnFisOBoZxcGtQd4B0GYJNZ" +
-                    "sDSiAEadUBCkstPtN3Avs2Msa+Dt9XfxoFSNYF/Bh9gP0bOqHLAm2WUF1YQskwrVFYPWkf3h1iXwbvqG" +
-                    "fFPSGW9Eah8HSS9fuZDnS32f71m8KFY7xs/QZyu6TH2+2+FAAAAABJRU5ErkJggg==\');\r\n\t\t}\r\n\t\tdi" +
-                    "v.tick-image {\r\n\t\t\twidth:            16px;\r\n\t\t\theight:           16px;\r\n\t\t\tbackg" +
-                    "round-image: url(\'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf" +
-                    "8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGr" +
-                    "SURBVDjLvZPZLkNhFIV75zjvYm7VGFNCqoZUJ+roKUUpjRuqp61Wq0NKDMelGGqOxBSUIBKXWtWGZxAv" +
-                    "obr8lWjChRgSF//dv9be+9trCwAI/vIE/26gXmviW5bqnb8yUK028qZjPfoPWEj4Ku5HBspgAz941IXZ" +
-                    "eze8N1bottSo8BTZviVWrEh546EO03EXpuJOdG63otJbjBKHkEp/Ml6yNYYzpuezWL4s5VMtT8acCMQc" +
-                    "b5XL3eJE8VgBlR7BeMGW9Z4yT9y1CeyucuhdTGDxfftaBO7G4L+zg91UocxVmCiy51NpiP3n2treUPuj" +
-                    "L8xhOjYOzZYsQWANyRYlU4Y9Br6oHd5bDh0bCpSOixJiWx71YY09J5pM/WEbzFcDmHvwwBu2wnikg+lE" +
-                    "j4mwBe5bC5h1OUqcwpdC60dxegRmR06TyjCF9G9z+qM2uCJmuMJmaNZaUrCSIi6X+jJIBBYtW5Cge7cd" +
-                    "7sgoHDfDaAvKQGAlRZYc6ltJlMxX03UzlaRlBdQrzSCwksLRbOpHUSb7pcsnxCCwngvM2Rm/ugUCi84f" +
-                    "ycr4l2t8Bb6iqTxSCgNIAAAAAElFTkSuQmCC\');\r\n\t\t}\r\n\t\tdiv.border {\r\n\t\t\tborder-style: d" +
-                    "ashed;\r\n\t\t\tborder-width: thin;\r\n\t\t\tmargin-bottom: 5px;\r\n\t\t}\r\n\t</style>\r\n\t<title>" +
-                    "");
+            this.Write("\r\n<html>\r\n<head>\r\n\t<script src=\"https://cdnjs.cloudflare.com/ajax/libs/vis/4.8.1/vis.min.js\"></script>\r\n\t<link href=\"https://cdnjs.cloudflare.com/ajax/libs/vis/4.8.1/vis.min.css\" rel=\"stylesheet\" type=\"text/css\" />\r\n\t<style type=\"text/css\">\r\n\t\t.vis-item-one { border-color:#00AABF; background-color:#7FD4DF; }\r\n\t\t.vis-item-two { border-color:#0D9DBC; background-color:#86CEDD; }\r\n\t\t.vis-item-three { border-color:#1B91B9; background-color:#8DC8DC; }\r\n\t\t.vis-item-four { border-color:#2885B6; background-color:#93C2DA; }\r\n\t\t.vis-item-five { border-color:#3679B3; background-color:#9ABCD9; }\r\n\t\t.vis-item-six { border-color:#446DB0; background-color:#A1B6D7; }\r\n\t\t.vis-item-seven { border-color:#5161AD; background-color:#A8B0D6; }\r\n\t\t.vis-item-eight { border-color:#5F55AB; background-color:#AFAAD5; }\r\n\t\t.vis-item-nine { border-color:#6D48A8; background-color:#B6A3D3; }\r\n\t\t.vis-item-ten { border-color:#7A3CA5; background-color:#BC9DD2; }\r\n\t\t.vis-item-eleven { border-color:#8830A2; background-color:#C397D0; }\r\n\t\t.vis-item-twelve { border-color:#96249F; background-color:#CA91CF; }\r\n\t\t.vis-item-thirteen { border-color:#A3189C; background-color:#D18BCD; }\r\n\t\t.vis-item-fourteen { border-color:#B10C99; background-color:#D885CC; }\r\n\t\t.vis-item-fifteen { border-color:#BF0097; background-color:#DF7FCB; }\r\n\t\tdiv.cross-image {\r\n\t\t\twidth:            16px;\r\n\t\t\theight:           16px;\r\n\t\t\tbackground-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAIhSURBVDjLlZPrThNRFIWJicmJz6BWiYbIkYDEG0JbBiitDQgm0PuFXqSAtKXtpE2hNuoPTXwSnwtExd6w0pl2OtPlrphKLSXhx07OZM769qy19wwAGLhM1ddC184+d18QMzoq3lfsD3LZ7Y3XbE5DL6Atzuyilc5Ciyd7IHVfgNcDYTQ2tvDr5crn6uLSvX+Av2Lk36FFpSVENDe3OxDZu8apO5rROJDLo30+Nlvj5RnTlVNAKs1aCVFr7b4BPn6Cls21AWgEQlz2+Dl1h7IdA+i97A/geP65WhbmrnZZ0GIJpr6OqZqYAd5/gJpKox4Mg7pD2YoC2b0/54rJQuJZdm6Izcgma4TW1WZ0h+y8BfbyJMwBmSxkjw+VObNanp5h/adwGhaTXF4NWbLj9gEONyCmUZmd10pGgf1/vwcgOT3tUQE0DdicwIod2EmSbwsKE1P8QoDkcHPJ5YESjgBJkYQpIEZ2KEB51Y6y3ojvY+P8XEDN7uKS0w0ltA7QGCWHCxSWWpwyaCeLy0BkA7UXyyg8fIzDoWHeBaDN4tQdSvAVdU1Aok+nsNTipIEVnkywo/FHatVkBoIhnFisOBoZxcGtQd4B0GYJNZsDSiAEadUBCkstPtN3Avs2Msa+Dt9XfxoFSNYF/Bh9gP0bOqHLAm2WUF1YQskwrVFYPWkf3h1iXwbvqGfFPSGW9Eah8HSS9fuZDnS32f71m8KFY7xs/QZyu6TH2+2+FAAAAABJRU5ErkJggg==');\r\n\t\t}\r\n\t\tdiv.tick-image {\r\n\t\t\twidth:            16px;\r\n\t\t\theight:           16px;\r\n\t\t\tbackground-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGrSURBVDjLvZPZLkNhFIV75zjvYm7VGFNCqoZUJ+roKUUpjRuqp61Wq0NKDMelGGqOxBSUIBKXWtWGZxAvobr8lWjChRgSF//dv9be+9trCwAI/vIE/26gXmviW5bqnb8yUK028qZjPfoPWEj4Ku5HBspgAz941IXZeze8N1bottSo8BTZviVWrEh546EO03EXpuJOdG63otJbjBKHkEp/Ml6yNYYzpuezWL4s5VMtT8acCMQcb5XL3eJE8VgBlR7BeMGW9Z4yT9y1CeyucuhdTGDxfftaBO7G4L+zg91UocxVmCiy51NpiP3n2treUPujL8xhOjYOzZYsQWANyRYlU4Y9Br6oHd5bDh0bCpSOixJiWx71YY09J5pM/WEbzFcDmHvwwBu2wnikg+lEj4mwBe5bC5h1OUqcwpdC60dxegRmR06TyjCF9G9z+qM2uCJmuMJmaNZaUrCSIi6X+jJIBBYtW5Cge7cd7sgoHDfDaAvKQGAlRZYc6ltJlMxX03UzlaRlBdQrzSCwksLRbOpHUSb7pcsnxCCwngvM2Rm/ugUCi84fycr4l2t8Bb6iqTxSCgNIAAAAAElFTkSuQmCC');\r\n\t\t}\r\n\t\tdiv.border {\r\n\t\t\tborder-style: dashed;\r\n\t\t\tborder-width: thin;\r\n\t\t\tmargin-bottom: 5px;\r\n\t\t}\r\n\t</style>\r\n\t<title>");
             
-            #line 43 "D:\git\akkadotnet\Akka.MultiNodeTestRunner\src\Akka.MultiNode.TestAdapter\Internal\Persistence\VisualizerRuntimeTemplate.tt"
+            #line 42 "D:\git\akkadotnet\Akka.MultiNodeTestRunner\src\Akka.MultiNode.TestAdapter\Internal\Persistence\VisualizerRuntimeTemplate.tt"
  Write(Prefix); 
             
             #line default
             #line hidden
-            this.Write(@"</title>
-</head>
-<body>
-<details>
-	<summary>Help / Instructions</summary>
-	<p>Click on a timeline to activate. Click off the timeline or press ESC to deactivate</p>
-	<p>Scroll up to zoom into an active timeline. Scroll down to zoom out of an active timeline</p>
-	<p>Click and hold to move an active timeline.</p>
-</details>
-");
+            this.Write("</title>\r\n</head>\r\n<body>\r\n<details>\r\n\t<summary>Help / Instructions</summary>\r\n\t<p>Click on a timeline to activate. Click off the timeline or press ESC to deactivate</p>\r\n\t<p>Scroll up to zoom into an active timeline. Scroll down to zoom out of an active timeline</p>\r\n\t<p>Click and hold to move an active timeline.</p>\r\n</details>\r\n");
             
-            #line 52 "D:\git\akkadotnet\Akka.MultiNodeTestRunner\src\Akka.MultiNode.TestAdapter\Internal\Persistence\VisualizerRuntimeTemplate.tt"
+            #line 51 "D:\git\akkadotnet\Akka.MultiNodeTestRunner\src\Akka.MultiNode.TestAdapter\Internal\Persistence\VisualizerRuntimeTemplate.tt"
  foreach (var spec in Tree.Specs) { 
             
             #line default
             #line hidden
             this.Write("<div class=\"border\">\r\n<h3>");
             
-            #line 54 "D:\git\akkadotnet\Akka.MultiNodeTestRunner\src\Akka.MultiNode.TestAdapter\Internal\Persistence\VisualizerRuntimeTemplate.tt"
+            #line 53 "D:\git\akkadotnet\Akka.MultiNodeTestRunner\src\Akka.MultiNode.TestAdapter\Internal\Persistence\VisualizerRuntimeTemplate.tt"
  Write(spec.FactName.Replace(Prefix, "")); 
             
             #line default
             #line hidden
             this.Write("</h3>\r\n<div id=\"");
             
-            #line 55 "D:\git\akkadotnet\Akka.MultiNodeTestRunner\src\Akka.MultiNode.TestAdapter\Internal\Persistence\VisualizerRuntimeTemplate.tt"
+            #line 54 "D:\git\akkadotnet\Akka.MultiNodeTestRunner\src\Akka.MultiNode.TestAdapter\Internal\Persistence\VisualizerRuntimeTemplate.tt"
  Write(BuildSpecificationId(spec)); 
             
             #line default
             #line hidden
-            this.Write("\"></div>\r\n\r\n<script type=\"text/javascript\">\r\n\tvar container = document.getElement" +
-                    "ById(\'");
+            this.Write("\"></div>\r\n\r\n<script type=\"text/javascript\">\r\n\tvar container = document.getElementById('");
             
-            #line 58 "D:\git\akkadotnet\Akka.MultiNodeTestRunner\src\Akka.MultiNode.TestAdapter\Internal\Persistence\VisualizerRuntimeTemplate.tt"
+            #line 57 "D:\git\akkadotnet\Akka.MultiNodeTestRunner\src\Akka.MultiNode.TestAdapter\Internal\Persistence\VisualizerRuntimeTemplate.tt"
  Write(BuildSpecificationId(spec)); 
             
             #line default
             #line hidden
-            this.Write("\');\r\n\r\n\tvar items = [\r\n\t\t");
+            this.Write("');\r\n\r\n\tvar items = [\r\n\t\t");
             
-            #line 61 "D:\git\akkadotnet\Akka.MultiNodeTestRunner\src\Akka.MultiNode.TestAdapter\Internal\Persistence\VisualizerRuntimeTemplate.tt"
+            #line 60 "D:\git\akkadotnet\Akka.MultiNodeTestRunner\src\Akka.MultiNode.TestAdapter\Internal\Persistence\VisualizerRuntimeTemplate.tt"
  Write(BuildTimelineItem(spec)); 
             
             #line default
             #line hidden
             this.Write("\t];\r\n\r\n\tvar groups = [\r\n\t\t");
             
-            #line 65 "D:\git\akkadotnet\Akka.MultiNodeTestRunner\src\Akka.MultiNode.TestAdapter\Internal\Persistence\VisualizerRuntimeTemplate.tt"
+            #line 64 "D:\git\akkadotnet\Akka.MultiNodeTestRunner\src\Akka.MultiNode.TestAdapter\Internal\Persistence\VisualizerRuntimeTemplate.tt"
  Write(BuildGroupItems(spec)); 
             
             #line default
             #line hidden
             this.Write("\t];\r\n\r\n\tvar options = ");
             
-            #line 68 "D:\git\akkadotnet\Akka.MultiNodeTestRunner\src\Akka.MultiNode.TestAdapter\Internal\Persistence\VisualizerRuntimeTemplate.tt"
+            #line 67 "D:\git\akkadotnet\Akka.MultiNodeTestRunner\src\Akka.MultiNode.TestAdapter\Internal\Persistence\VisualizerRuntimeTemplate.tt"
  Write(BuildOptions(spec)); 
             
             #line default
             #line hidden
-            this.Write(";\r\n\r\n\tvar timeline = new vis.Timeline(container, items, groups, options);\r\n</scri" +
-                    "pt>\r\n</div>\r\n");
+            this.Write(";\r\n\r\n\tvar timeline = new vis.Timeline(container, items, groups, options);\r\n</script>\r\n</div>\r\n");
             
-            #line 73 "D:\git\akkadotnet\Akka.MultiNodeTestRunner\src\Akka.MultiNode.TestAdapter\Internal\Persistence\VisualizerRuntimeTemplate.tt"
+            #line 72 "D:\git\akkadotnet\Akka.MultiNodeTestRunner\src\Akka.MultiNode.TestAdapter\Internal\Persistence\VisualizerRuntimeTemplate.tt"
  } 
             
             #line default
diff --git a/src/Akka.MultiNode.TestAdapter/Internal/Persistence/VisualizerRuntimeTemplate.tt b/src/Akka.MultiNode.TestAdapter/Internal/Persistence/VisualizerRuntimeTemplate.tt
index 72d9732..e8fa5e9 100644
--- a/src/Akka.MultiNode.TestAdapter/Internal/Persistence/VisualizerRuntimeTemplate.tt
+++ b/src/Akka.MultiNode.TestAdapter/Internal/Persistence/VisualizerRuntimeTemplate.tt
@@ -1,5 +1,4 @@
 <#@ template language="C#" #>
-<#@ assembly name="System.Core" #>
 <#@ import namespace="System.Linq" #>
 <#@ import namespace="System.Text" #>
 <#@ import namespace="System.Collections.Generic" #>
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
new file mode 100644
index 0000000..aaf5b7a
--- /dev/null
+++ b/src/Directory.Build.props
@@ -0,0 +1,41 @@
+<Project>
+  <PropertyGroup>
+    <Copyright>Copyright © 2013-2023 Akka.NET Team</Copyright>
+    <Authors>Akka.NET Team</Authors>
+    <VersionPrefix>1.5.8</VersionPrefix>
+    <NoWarn>$(NoWarn);CS1591;xUnit1013</NoWarn>
+    <LangVersion>latest</LangVersion>
+  </PropertyGroup>
+  <PropertyGroup>
+    <NetCoreTestVersion>netcoreapp3.1</NetCoreTestVersion>
+    <NetTestVersion>net6.0</NetTestVersion>
+    <NetStandardLibVersion>netstandard2.0</NetStandardLibVersion>
+  </PropertyGroup>
+  <PropertyGroup>
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+  </PropertyGroup>
+  <!-- SourceLink support for all Akka.NET projects -->
+  <ItemGroup>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
+  </ItemGroup>
+  <!-- Embedded icon and readme file -->
+  <ItemGroup>
+    <None Include="$(MSBuildThisFileDirectory)\..\docs\images\icon.png" Pack="true" PackagePath="\" />
+    <None Include="$(MSBuildThisFileDirectory)\..\README.md" Pack="true" PackagePath="\" />
+  </ItemGroup>
+  <!-- NuGet .nupkg options -->
+  <PropertyGroup>
+    <PackageReleaseNotes>[Updated Akka.NET to 1.5.8](https://github.com/akkadotnet/akka.net/releases/tag/1.5.8) - which resolves issues with Akka.NET runtime and `Polyfill` errors.</PackageReleaseNotes>
+    <PackageTags>akka;actors;actor model;Akka;concurrency;test</PackageTags>
+    <PackageProjectUrl>https://github.com/akkadotnet/Akka.MultiNodeTestRunner</PackageProjectUrl>
+    <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
+    <PackageIcon>icon.png</PackageIcon>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <!-- Optional: Embed source files that are not tracked by the source control manager in the PDB -->
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <!-- Optional: Build symbol package (.snupkg) to distribute the PDB containing Source Link -->
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
new file mode 100644
index 0000000..fe4e5a4
--- /dev/null
+++ b/src/Directory.Packages.props
@@ -0,0 +1,24 @@
+<Project>
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+  </PropertyGroup>
+  <!-- App dependencies -->
+  <ItemGroup>
+    <PackageVersion Include="Akka.Cluster.TestKit" Version="1.5.13" />
+    <PackageVersion Include="TeamCity.ServiceMessages" Version="4.0.0" />
+    <PackageVersion Include="System.CodeDom" Version="7.0.0" />
+    <PackageVersion Include="System.Runtime.Loader" Version="4.3.0" />
+    <PackageVersion Include="xunit.runner.utility" Version="2.5.0" />
+  </ItemGroup>
+  <!-- Test dependencies -->
+  <ItemGroup>
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageVersion Include="FluentAssertions" Version="6.12.0" />
+    <PackageVersion Include="xunit" Version="2.5.0" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.0" />
+  </ItemGroup>
+  <!-- SourceLink support for all Akka.NET projects -->
+  <ItemGroup>
+    <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1 " />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/common.props b/src/common.props
deleted file mode 100644
index ad04c75..0000000
--- a/src/common.props
+++ /dev/null
@@ -1,48 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <Copyright>Copyright © 2013-2023 Akka.NET Team</Copyright>
-    <Authors>Akka.NET Team</Authors>
-    <VersionPrefix>1.5.0</VersionPrefix>
-    <PackageIconUrl>https://getakka.net/images/akkalogo.png</PackageIconUrl>
-    <PackageProjectUrl>https://github.com/akkadotnet/akka.net</PackageProjectUrl>
-    <PackageLicenseUrl>https://github.com/akkadotnet/akka.net/blob/master/LICENSE</PackageLicenseUrl>
-    <NoWarn>$(NoWarn);CS1591;xUnit1013</NoWarn>
-  </PropertyGroup>
-  <PropertyGroup>
-    <XunitVersion>2.4.2</XunitVersion>
-    <XunitRunnerVersion>2.4.5</XunitRunnerVersion>
-    <TestSdkVersion>17.7.2</TestSdkVersion>
-    <CodeDomVersion>7.0.0</CodeDomVersion>
-    <TeamCityVersion>3.0.13</TeamCityVersion>
-    <SystemRuntimeLoaderVersion>4.3.0</SystemRuntimeLoaderVersion>
-    <DependencyModelVersion>5.0.0</DependencyModelVersion>
-    <NewtonsoftJsonVersion>[13.0.1,)</NewtonsoftJsonVersion>
-    <NBenchVersion>2.0.1</NBenchVersion>
-    <ProtobufVersion>3.21.12</ProtobufVersion>
-    <NetCoreTestVersion>netcoreapp3.1</NetCoreTestVersion>
-    <NetTestVersion>net6.0</NetTestVersion>
-    <NetStandardLibVersion>netstandard2.0</NetStandardLibVersion>
-    <FluentAssertionsVersion>6.11.0</FluentAssertionsVersion>
-    <FsCheckVersion>2.16.5</FsCheckVersion>
-    <AkkaVersion>1.5.8</AkkaVersion>
-    <AkkaPackageTags>akka;actors;actor model;Akka;concurrency</AkkaPackageTags>
-  </PropertyGroup>
-  <PropertyGroup>
-    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-  </PropertyGroup>
-  <PropertyGroup>
-    <PackageReleaseNotes>[Updated Akka.NET to 1.5.0](https://github.com/akkadotnet/akka.net/releases/tag/1.5.0)</PackageReleaseNotes>
-  </PropertyGroup>
-  <!-- SourceLink support for all Akka.NET projects -->
-  <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
-  </ItemGroup>
-  <PropertyGroup>
-    <PublishRepositoryUrl>true</PublishRepositoryUrl>
-    <!-- Optional: Embed source files that are not tracked by the source control manager in the PDB -->
-    <EmbedUntrackedSources>true</EmbedUntrackedSources>
-    <!-- Optional: Build symbol package (.snupkg) to distribute the PDB containing Source Link -->
-    <IncludeSymbols>true</IncludeSymbols>
-    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-  </PropertyGroup>
-</Project>