diff --git a/.gitignore b/.gitignore
index 491d60aee..f8bdaf34f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,7 @@
 [Dd]ebugPublic/
 [Rr]elease/
 [Rr]eleases/
+AnyCPU/
 x64/
 x86/
 bld/
diff --git a/src/Diagnostics.HealthChecks.AspNetCore/Microsoft.Omex.Extensions.Diagnostics.HealthChecks.AspNetCore.csproj b/src/Diagnostics.HealthChecks.AspNetCore/Microsoft.Omex.Extensions.Diagnostics.HealthChecks.AspNetCore.csproj
index 99ace5fdd..8cf361983 100644
--- a/src/Diagnostics.HealthChecks.AspNetCore/Microsoft.Omex.Extensions.Diagnostics.HealthChecks.AspNetCore.csproj
+++ b/src/Diagnostics.HealthChecks.AspNetCore/Microsoft.Omex.Extensions.Diagnostics.HealthChecks.AspNetCore.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>$(NetCoreVersions)</TargetFrameworks>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTargets>$(Platforms)</PlatformTargets>
   </PropertyGroup>
   <PropertyGroup Label="NuGet Properties">
     <Title>Microsoft.Omex.Extensions.Diagnostics.HealthChecks.AspNetCore</Title>
diff --git a/src/Diagnostics.HealthChecks/Microsoft.Omex.Extensions.Diagnostics.HealthChecks.csproj b/src/Diagnostics.HealthChecks/Microsoft.Omex.Extensions.Diagnostics.HealthChecks.csproj
index 2e7251202..390c32760 100644
--- a/src/Diagnostics.HealthChecks/Microsoft.Omex.Extensions.Diagnostics.HealthChecks.csproj
+++ b/src/Diagnostics.HealthChecks/Microsoft.Omex.Extensions.Diagnostics.HealthChecks.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>$(NetCoreVersions)</TargetFrameworks>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTargets>$(Platforms)</PlatformTargets>
   </PropertyGroup>
   <PropertyGroup Label="NuGet Properties">
     <Title>Microsoft.Omex.Extensions.Diagnostics.HealthChecks</Title>
diff --git a/src/Hosting.Services.Remoting/Microsoft.Omex.Extensions.Hosting.Services.Remoting.csproj b/src/Hosting.Services.Remoting/Microsoft.Omex.Extensions.Hosting.Services.Remoting.csproj
index d8e672d26..e16250178 100644
--- a/src/Hosting.Services.Remoting/Microsoft.Omex.Extensions.Hosting.Services.Remoting.csproj
+++ b/src/Hosting.Services.Remoting/Microsoft.Omex.Extensions.Hosting.Services.Remoting.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>$(NetCoreVersions)</TargetFrameworks>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTargets>$(Platforms)</PlatformTargets>
   </PropertyGroup>
   <PropertyGroup Label="NuGet Properties">
     <Title>Microsoft.Omex.Extensions.Hosting.Services.Remoting</Title>
diff --git a/src/Hosting.Services.Web/Microsoft.Omex.Extensions.Hosting.Services.Web.csproj b/src/Hosting.Services.Web/Microsoft.Omex.Extensions.Hosting.Services.Web.csproj
index 9b723c29a..d515985b3 100644
--- a/src/Hosting.Services.Web/Microsoft.Omex.Extensions.Hosting.Services.Web.csproj
+++ b/src/Hosting.Services.Web/Microsoft.Omex.Extensions.Hosting.Services.Web.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>$(NetCoreVersions)</TargetFrameworks>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTargets>$(Platforms)</PlatformTargets>
   </PropertyGroup>
   <PropertyGroup Label="NuGet Properties">
     <Title>Microsoft.Omex.Extensions.Hosting.Services.Web</Title>
diff --git a/src/Hosting.Services/Microsoft.Omex.Extensions.Hosting.Services.csproj b/src/Hosting.Services/Microsoft.Omex.Extensions.Hosting.Services.csproj
index 4f8c9060b..039fba72e 100644
--- a/src/Hosting.Services/Microsoft.Omex.Extensions.Hosting.Services.csproj
+++ b/src/Hosting.Services/Microsoft.Omex.Extensions.Hosting.Services.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>$(NetCoreVersions)</TargetFrameworks>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTargets>$(Platforms)</PlatformTargets>
   </PropertyGroup>
   <PropertyGroup Label="NuGet Properties">
     <Title>Microsoft.Omex.Extensions.Hosting.Services</Title>
diff --git a/src/ServiceFabricGuest.Abstractions/Microsoft.Omex.Extensions.ServiceFabricGuest.Abstractions.csproj b/src/ServiceFabricGuest.Abstractions/Microsoft.Omex.Extensions.ServiceFabricGuest.Abstractions.csproj
index 0ec2567f9..501b86548 100644
--- a/src/ServiceFabricGuest.Abstractions/Microsoft.Omex.Extensions.ServiceFabricGuest.Abstractions.csproj
+++ b/src/ServiceFabricGuest.Abstractions/Microsoft.Omex.Extensions.ServiceFabricGuest.Abstractions.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>$(NetCoreVersions)</TargetFrameworks>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTargets>$(Platforms)</PlatformTargets>
   </PropertyGroup>
 
   <PropertyGroup Label="NuGet Properties">
diff --git a/src/Services.Remoting/Microsoft.Omex.Extensions.Services.Remoting.csproj b/src/Services.Remoting/Microsoft.Omex.Extensions.Services.Remoting.csproj
index dc2c5fe20..31b99f467 100644
--- a/src/Services.Remoting/Microsoft.Omex.Extensions.Services.Remoting.csproj
+++ b/src/Services.Remoting/Microsoft.Omex.Extensions.Services.Remoting.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>$(NetCoreVersions)</TargetFrameworks>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTargets>$(Platforms)</PlatformTargets>
   </PropertyGroup>
   <PropertyGroup Label="NuGet Properties">
     <Title>Microsoft.Omex.Extensions.Services.Remoting</Title>
diff --git a/tests/Diagnostics.HealthChecks.AspNetCore.UnitTests/Microsoft.Omex.Extensions.Diagnostics.HealthChecks.AspNetCore.UnitTests.csproj b/tests/Diagnostics.HealthChecks.AspNetCore.UnitTests/Microsoft.Omex.Extensions.Diagnostics.HealthChecks.AspNetCore.UnitTests.csproj
index 12a9d1f50..c09d3af30 100644
--- a/tests/Diagnostics.HealthChecks.AspNetCore.UnitTests/Microsoft.Omex.Extensions.Diagnostics.HealthChecks.AspNetCore.UnitTests.csproj
+++ b/tests/Diagnostics.HealthChecks.AspNetCore.UnitTests/Microsoft.Omex.Extensions.Diagnostics.HealthChecks.AspNetCore.UnitTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
     <TargetFrameworks>$(UnitTestTargetFrameworks)</TargetFrameworks>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTargets>$(Platforms)</PlatformTargets>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Diagnostics.HealthChecks.AspNetCore\Microsoft.Omex.Extensions.Diagnostics.HealthChecks.AspNetCore.csproj" />
diff --git a/tests/Diagnostics.HealthChecks.UnitTests/Microsoft.Omex.Extensions.Diagnostics.HealthChecks.UnitTests.csproj b/tests/Diagnostics.HealthChecks.UnitTests/Microsoft.Omex.Extensions.Diagnostics.HealthChecks.UnitTests.csproj
index 9e6e94546..be3a32d83 100644
--- a/tests/Diagnostics.HealthChecks.UnitTests/Microsoft.Omex.Extensions.Diagnostics.HealthChecks.UnitTests.csproj
+++ b/tests/Diagnostics.HealthChecks.UnitTests/Microsoft.Omex.Extensions.Diagnostics.HealthChecks.UnitTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>$(UnitTestTargetFrameworks)</TargetFrameworks>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTargets>$(Platforms)</PlatformTargets>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Diagnostics.HealthChecks\Microsoft.Omex.Extensions.Diagnostics.HealthChecks.csproj" />
diff --git a/tests/Hosting.Services.Remoting.UnitTests/Microsoft.Omex.Extensions.Hosting.Services.Remoting.UnitTests.csproj b/tests/Hosting.Services.Remoting.UnitTests/Microsoft.Omex.Extensions.Hosting.Services.Remoting.UnitTests.csproj
index ab2f1ec5a..69299ae8a 100644
--- a/tests/Hosting.Services.Remoting.UnitTests/Microsoft.Omex.Extensions.Hosting.Services.Remoting.UnitTests.csproj
+++ b/tests/Hosting.Services.Remoting.UnitTests/Microsoft.Omex.Extensions.Hosting.Services.Remoting.UnitTests.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>$(UnitTestTargetFrameworks)</TargetFrameworks>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTargets>$(Platforms)</PlatformTargets>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Hosting.Services.Remoting\Microsoft.Omex.Extensions.Hosting.Services.Remoting.csproj" />
diff --git a/tests/Hosting.Services.UnitTests/Microsoft.Omex.Extensions.Hosting.Services.UnitTests.csproj b/tests/Hosting.Services.UnitTests/Microsoft.Omex.Extensions.Hosting.Services.UnitTests.csproj
index 1268557bb..802a837e0 100644
--- a/tests/Hosting.Services.UnitTests/Microsoft.Omex.Extensions.Hosting.Services.UnitTests.csproj
+++ b/tests/Hosting.Services.UnitTests/Microsoft.Omex.Extensions.Hosting.Services.UnitTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>$(UnitTestTargetFrameworks)</TargetFrameworks>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTargets>$(Platforms)</PlatformTargets>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.ServiceFabric.Actors" />
diff --git a/tests/Hosting.Services.Web.UnitTests/Microsoft.Omex.Extensions.Hosting.Services.Web.UnitTests.csproj b/tests/Hosting.Services.Web.UnitTests/Microsoft.Omex.Extensions.Hosting.Services.Web.UnitTests.csproj
index cfc00477c..80bac7c8e 100644
--- a/tests/Hosting.Services.Web.UnitTests/Microsoft.Omex.Extensions.Hosting.Services.Web.UnitTests.csproj
+++ b/tests/Hosting.Services.Web.UnitTests/Microsoft.Omex.Extensions.Hosting.Services.Web.UnitTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>$(UnitTestTargetFrameworks)</TargetFrameworks>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTargets>$(Platforms)</PlatformTargets>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Hosting.Services.Web\Microsoft.Omex.Extensions.Hosting.Services.Web.csproj" />
diff --git a/tests/ServiceFabricGuest.Abstractions.UnitTests/Microsoft.Omex.Extensions.ServiceFabricGuest.Abstractions.UnitTests.csproj b/tests/ServiceFabricGuest.Abstractions.UnitTests/Microsoft.Omex.Extensions.ServiceFabricGuest.Abstractions.UnitTests.csproj
index c288d2f5f..412a109ea 100644
--- a/tests/ServiceFabricGuest.Abstractions.UnitTests/Microsoft.Omex.Extensions.ServiceFabricGuest.Abstractions.UnitTests.csproj
+++ b/tests/ServiceFabricGuest.Abstractions.UnitTests/Microsoft.Omex.Extensions.ServiceFabricGuest.Abstractions.UnitTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>$(UnitTestTargetFrameworks)</TargetFrameworks>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTargets>$(Platforms)</PlatformTargets>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Hosting\Microsoft.Omex.Extensions.Hosting.csproj" />
diff --git a/tests/Services.Remoting.UnitTests/Microsoft.Omex.Extensions.Services.Remoting.UnitTests.csproj b/tests/Services.Remoting.UnitTests/Microsoft.Omex.Extensions.Services.Remoting.UnitTests.csproj
index c21b0dd50..c341d7c04 100644
--- a/tests/Services.Remoting.UnitTests/Microsoft.Omex.Extensions.Services.Remoting.UnitTests.csproj
+++ b/tests/Services.Remoting.UnitTests/Microsoft.Omex.Extensions.Services.Remoting.UnitTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>$(UnitTestTargetFrameworks)</TargetFrameworks>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTargets>$(Platforms)</PlatformTargets>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.ServiceFabric.Actors" />