diff --git a/src/Kyoo.Host.WindowsTrait/Kyoo.Host.WindowsTrait.Skipped.target b/src/Kyoo.Host.WindowsTrait/Kyoo.Host.WindowsTrait.Skipped.target
new file mode 100644
index 00000000..62ab4d53
--- /dev/null
+++ b/src/Kyoo.Host.WindowsTrait/Kyoo.Host.WindowsTrait.Skipped.target
@@ -0,0 +1,16 @@
+<Project>
+	<Target Name="Build">
+		<Message Importance="high" Text="Detected current operating system is not windows, skipping WindowsHost build." />
+	</Target>
+	<Target Name="Clean"/>
+	<Target Name="Pack"/>
+	<Target Name="Restore"/>
+	<Target Name="Publish">
+		<Message Importance="high" Text="Detected current operating system is not windows, skipping WindowsHost build." />
+	</Target>
+
+	<ItemGroup>
+		<None Include="@(Compile)" Visible="true" />
+		<Compile Remove="*" />
+	</ItemGroup>
+</Project>
diff --git a/src/Kyoo.Host.WindowsTrait/Kyoo.Host.WindowsTrait.csproj b/src/Kyoo.Host.WindowsTrait/Kyoo.Host.WindowsTrait.csproj
index a889b6e4..084b6541 100644
--- a/src/Kyoo.Host.WindowsTrait/Kyoo.Host.WindowsTrait.csproj
+++ b/src/Kyoo.Host.WindowsTrait/Kyoo.Host.WindowsTrait.csproj
@@ -23,17 +23,9 @@
 	</PropertyGroup>
 
 	<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
+	<Import Project="Kyoo.Host.WindowsTrait.Skipped.target" Condition="$(IsWindows) != true" />
 
-	<Target Name="Build" Condition="$(IsWindows) != true">
-		<Message Importance="high" Text="Detected current operating system is not windows, skipping WindowsHost build." />
-	</Target>
-	<Target Name="Clean" Condition="$(IsWindows) != true" />
-	<Target Name="Pack" Condition="$(IsWindows) != true" />
-	<Target Name="Restore" Condition="$(IsWindows) != true" />
-	<Target Name="Publish" Condition="$(IsWindows) != true" />
-
-	<ItemGroup Condition="$(IsWindows) != true">
-		<None Include="@(Compile)" Visible="true" />
-		<Compile Remove="*" />
+	<ItemGroup>
+		<None Remove="*.target" />
 	</ItemGroup>
 </Project>