diff --git a/.github/workflows/build-net40.yml b/.github/workflows/build-net40.yml
index 5657115f..54a749ed 100644
--- a/.github/workflows/build-net40.yml
+++ b/.github/workflows/build-net40.yml
@@ -1,18 +1,26 @@
 name: Build Net40
 
 on:
+  push:
+    branches:
+      - main
+      - master
+  pull_request:
   workflow_dispatch:
 
 jobs:
   build-net40:
-    runs-on:
-      - self-hosted
-      - windows
+    runs-on: windows-latest
 
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: Setup .NET SDK
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: 10.0.x
+
       - name: Setup MSBuild
         uses: microsoft/setup-msbuild@v2
 
@@ -28,7 +36,7 @@ jobs:
         shell: pwsh
         run: |
           $solutionDir = "$(Resolve-Path src)\\"
-          msbuild src/WPFDevelopers.Net40/WPFDevelopers.Net40.csproj /p:Configuration=Release-.NET40 /p:Platform="Any CPU" /p:SignAssembly=false /p:SolutionDir="$solutionDir" /m
+          msbuild src/WPFDevelopers.Net40/WPFDevelopers.Net40.csproj /restore /p:Configuration=Release-.NET40 /p:Platform="Any CPU" /p:SignAssembly=false /p:SolutionDir="$solutionDir" /m
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
diff --git a/src/WPFDevelopers.Net40/WPFDevelopers.Net40.csproj b/src/WPFDevelopers.Net40/WPFDevelopers.Net40.csproj
index 670bfb21..e5b3510a 100644
--- a/src/WPFDevelopers.Net40/WPFDevelopers.Net40.csproj
+++ b/src/WPFDevelopers.Net40/WPFDevelopers.Net40.csproj
@@ -1,12 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 	<Import Project="../Package.props" />
 	<PropertyGroup>
-		<RestoreProjectStyle>None</RestoreProjectStyle>
+		<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
 		<TargetFramework>net40</TargetFramework>
 		<SignAssembly>True</SignAssembly>
 	</PropertyGroup>
 	<Import Project="..\WPFDevelopers.Shared\WPFDevelopers.Shared.projitems" Label="Shared" />
 	<Import Project="..\Microsoft.Windows.Shell\Microsoft.Windows.Shell.projitems" Label="Shared" />
+	<ItemGroup>
+		<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net40" Version="1.0.3" />
+	</ItemGroup>
 	<Target Name="PreBuild" BeforeTargets="PreBuildEvent">
 		<Exec Command="$(SolutionDir)WPFDevelopers.Shared\Themes\XamlCombine.exe $(SolutionDir)WPFDevelopers.Shared\Themes\Theme40.txt $(ProjectDir)Themes\Theme.xaml" />
 	</Target>