diff --git a/Kyoo.Transcoder b/Kyoo.Transcoder
index 48782f89..7bae8def 160000
--- a/Kyoo.Transcoder
+++ b/Kyoo.Transcoder
@@ -1 +1 @@
-Subproject commit 48782f895a40f28eda5e861fcaa624c0eab54076
+Subproject commit 7bae8def39ace7bab481efea4825c4802e9e1f31
diff --git a/Kyoo.WindowsHost/Kyoo.WindowsHost.csproj b/Kyoo.WindowsHost/Kyoo.WindowsHost.csproj
index eeb412ca..35a4a4b8 100644
--- a/Kyoo.WindowsHost/Kyoo.WindowsHost.csproj
+++ b/Kyoo.WindowsHost/Kyoo.WindowsHost.csproj
@@ -1,21 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
+<Project>
 	<PropertyGroup>
-		<OutputType>WinExe</OutputType>
-		<TargetFramework>net5.0-windows</TargetFramework>
-		<UseWindowsForms>true</UseWindowsForms>
-		<RootNamespace>Kyoo.Host.Windows</RootNamespace>
+		<IsWindows Condition="$([MSBuild]::IsOSPlatform('Windows'))">true</IsWindows>
 	</PropertyGroup>
-
+	
+	<Import Project="Kyoo.WindowsHost.target" Condition="$(IsWindows) == true" />
+	<Import Project="Kyoo.WindowsHost.linux.target" Condition="$(IsWindows) != true" />
+	
 	<ItemGroup>
-		<ProjectReference Include="../Kyoo/Kyoo.csproj" />
+		<None Remove="*.target" />
 	</ItemGroup>
-
-	<ItemGroup>
-	  <None Remove="kyoo.ico" />
-	  <Content Include="kyoo.ico">
-	    <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-	  </Content>
-	</ItemGroup>
-
 </Project>
\ No newline at end of file
diff --git a/Kyoo.WindowsHost/Kyoo.WindowsHost.linux.target b/Kyoo.WindowsHost/Kyoo.WindowsHost.linux.target
new file mode 100644
index 00000000..2cccfbd3
--- /dev/null
+++ b/Kyoo.WindowsHost/Kyoo.WindowsHost.linux.target
@@ -0,0 +1,12 @@
+<Project>
+	<!-- Project file used instead of the default csproj when the host system is not windows. This only skip the build. -->
+	
+	<PropertyGroup>
+		<TargetFramework>net5.0</TargetFramework>
+		<NoWarn>NU1503</NoWarn>
+	</PropertyGroup>
+
+	<Target Name="Build">
+		<Message Importance="high" Text="Detected current operating system is not windows, skipping WindowsHost build." />
+	</Target>
+</Project>
\ No newline at end of file
diff --git a/Kyoo.WindowsHost/Kyoo.WindowsHost.target b/Kyoo.WindowsHost/Kyoo.WindowsHost.target
new file mode 100644
index 00000000..70bd90b0
--- /dev/null
+++ b/Kyoo.WindowsHost/Kyoo.WindowsHost.target
@@ -0,0 +1,23 @@
+<Project Sdk="Microsoft.NET.Sdk">
+	<!-- Project file used instead of the default csproj when the host system is windows. 
+	     This is the real csproj used to compile the project.
+	 -->
+
+	<PropertyGroup>
+		<OutputType>WinExe</OutputType>
+		<TargetFramework>net5.0-windows</TargetFramework>
+		<UseWindowsForms>true</UseWindowsForms>
+		<RootNamespace>Kyoo.WindowsHost</RootNamespace>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="../Kyoo/Kyoo.csproj"/>
+	</ItemGroup>
+
+	<ItemGroup>
+		<None Remove="kyoo.ico"/>
+		<Content Include="kyoo.ico">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Content>
+	</ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Kyoo.WindowsHost/Program.cs b/Kyoo.WindowsHost/Program.cs
index 73c1cedc..46e0d427 100644
--- a/Kyoo.WindowsHost/Program.cs
+++ b/Kyoo.WindowsHost/Program.cs
@@ -4,7 +4,7 @@ using Autofac;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Win32;
 
-namespace Kyoo.Host.Windows
+namespace Kyoo.WindowsHost
 {
 	public static class Program
 	{
diff --git a/Kyoo.WindowsHost/SystemTrait.cs b/Kyoo.WindowsHost/SystemTrait.cs
index 5201f239..6e120682 100644
--- a/Kyoo.WindowsHost/SystemTrait.cs
+++ b/Kyoo.WindowsHost/SystemTrait.cs
@@ -8,7 +8,7 @@ using Autofac;
 using Kyoo.Models.Options;
 using Microsoft.Extensions.Options;
 
-namespace Kyoo.Host.Windows
+namespace Kyoo.WindowsHost
 {
 	/// <summary>
 	/// A singleton that add an notification icon on the window's toolbar.
diff --git a/Kyoo/Kyoo.csproj b/Kyoo/Kyoo.csproj
index 4fc74690..69f37d87 100644
--- a/Kyoo/Kyoo.csproj
+++ b/Kyoo/Kyoo.csproj
@@ -18,9 +18,13 @@
 	</PropertyGroup>
 
 	<PropertyGroup>
-		<TranscoderBinary Condition="'$(IsWindows)' == 'true'">transcoder.dll</TranscoderBinary>
-		<TranscoderBinary Condition="'$(IsOSX)' == 'true'">libtranscoder.dylib</TranscoderBinary>
-		<TranscoderBinary Condition="'$(IsLinux)' == 'true'">libtranscoder.so</TranscoderBinary>
+		<TranscoderBinary Condition="$(IsWindows) == true">transcoder.dll</TranscoderBinary>
+		<TranscoderBinary Condition="$(IsOSX) == true">libtranscoder.dylib</TranscoderBinary>
+		<TranscoderBinary Condition="$(IsLinux) == true">libtranscoder.so</TranscoderBinary>
+		
+		<TranscoderBuild Condition="$(IsWindows) == true">$(TranscoderRoot)buildWin</TranscoderBuild>
+		<TranscoderBuild Condition="$(IsOSX) == true">$(TranscoderRoot)buildOSX</TranscoderBuild>
+		<TranscoderBuild Condition="$(IsLinux) == true">$(TranscoderRoot)build</TranscoderBuild>
 	</PropertyGroup>
 
 	<ItemGroup>
@@ -48,13 +52,13 @@
 		<ProjectReference Include="../Kyoo.WebApp/Kyoo.WebApp.csproj" />
 	</ItemGroup>
 
-	<Target Name="BuildTranscoder" BeforeTargets="BeforeBuild" Condition="'$(SkipTranscoder)' != 'true' And !Exists('$(TranscoderRoot)/build/$(TranscoderBinary)')">
-		<Exec WorkingDirectory="$(TranscoderRoot)" Condition="'$(IsWindows)' != 'true'" Command="mkdir -p build %26%26 cd build %26%26 cmake .. %26%26 make -j" />
-		<Exec WorkingDirectory="$(TranscoderRoot)" Condition="'$(IsWindows)' == 'true'" Command="(if not exist build mkdir build) %26%26 cd build %26%26 cmake .. -G &quot;NMake Makefiles&quot; %26%26 nmake" />
+	<Target Name="BuildTranscoder" BeforeTargets="BeforeBuild" Condition="'$(SkipTranscoder)' != 'true' And !Exists('$(TranscoderBuild)/$(TranscoderBinary)')">
+		<Exec Command="mkdir -p $(TranscoderBuild) %26%26 cd $(TranscoderBuild) %26%26 cmake $(TranscoderRoot) %26%26 make -j" Condition="'$(IsWindows)' != 'true'" />
+		<Exec Command="(if not exist build mkdir $(TranscoderBuild)) %26%26 cd $(TranscoderBuild) %26%26 cmake $(TranscoderRoot) -G &quot;NMake Makefiles&quot; %26%26 nmake" Condition="'$(IsWindows)' == 'true'" />
 	</Target>
 	
 	<ItemGroup Condition="'$(SkipTranscoder)' != 'true'">
-		<None Include="$(TranscoderRoot)/build/$(TranscoderBinary)">
+		<None Include="$(TranscoderBuild)/$(TranscoderBinary)">
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 			<Visible>false</Visible>
 		</None>