diff --git a/README.md b/README.md
index ea93a62a..3793d522 100644
--- a/README.md
+++ b/README.md
@@ -44,7 +44,6 @@ Hosting for Moonlight's Raspberry Pi and L4T package repositories is graciously
 * [Visual Studio 2019](https://visualstudio.microsoft.com/downloads/) (Community edition is fine)
 * Select **MSVC 2019** option during Qt installation. MinGW is not supported.
 * [7-Zip](https://www.7-zip.org/) (only if building installers for non-development PCs)
-* Wix 4 .NET Tool (install using `dotnet tool install --global wix`)
 
 ### macOS Build Requirements
 * Qt 6.2 SDK or later
diff --git a/scripts/build-arch.bat b/scripts/build-arch.bat
index fc5da1e0..2429fc21 100644
--- a/scripts/build-arch.bat
+++ b/scripts/build-arch.bat
@@ -215,12 +215,6 @@ echo Building MSI
 msbuild -Restore %SOURCE_ROOT%\wix\Moonlight\Moonlight.wixproj /p:Configuration=%BUILD_CONFIG% /p:Platform=%ARCH%
 if !ERRORLEVEL! NEQ 0 goto Error
 
-if "%SIGN%"=="1" (
-    echo Signing MSI
-    signtool %SIGNTOOL_PARAMS% %BUILD_FOLDER%\Moonlight.msi
-    if !ERRORLEVEL! NEQ 0 goto Error
-)
-
 echo Copying application binary to deployment directory
 copy %BUILD_FOLDER%\app\%BUILD_CONFIG%\Moonlight.exe %DEPLOY_FOLDER%
 if !ERRORLEVEL! NEQ 0 goto Error
diff --git a/scripts/generate-bundle.bat b/scripts/generate-bundle.bat
index c702c46c..8e6066d1 100644
--- a/scripts/generate-bundle.bat
+++ b/scripts/generate-bundle.bat
@@ -81,21 +81,9 @@ if !ERRORLEVEL! NEQ 0 goto Error
 
 echo Building bundle
 rem Bundles are always x86 binaries
-msbuild %SOURCE_ROOT%\wix\MoonlightSetup\MoonlightSetup.wixproj /p:Configuration=%BUILD_CONFIG% /p:Platform=x86 /p:DefineConstants="INCLUDE_ARM64=%INCLUDE_ARM64%"
+msbuild -Restore %SOURCE_ROOT%\wix\MoonlightSetup\MoonlightSetup.wixproj /p:Configuration=%BUILD_CONFIG% /p:Platform=x86 /p:DefineConstants="INCLUDE_ARM64=%INCLUDE_ARM64%"
 if !ERRORLEVEL! NEQ 0 goto Error
 
-if "%SIGN%"=="1" (
-    echo Signing bundle
-    "%WIX%\bin\insignia" -ib %INSTALLER_FOLDER%\MoonlightSetup.exe -o %BUILD_FOLDER%\engine.exe
-    if !ERRORLEVEL! NEQ 0 goto Error
-    signtool %SIGNTOOL_PARAMS% %BUILD_FOLDER%\engine.exe
-    if !ERRORLEVEL! NEQ 0 goto Error
-    "%WIX%\bin\insignia" -ab %BUILD_FOLDER%\engine.exe %INSTALLER_FOLDER%\MoonlightSetup.exe -o %INSTALLER_FOLDER%\MoonlightSetup.exe
-    if !ERRORLEVEL! NEQ 0 goto Error
-    signtool %SIGNTOOL_PARAMS% %INSTALLER_FOLDER%\MoonlightSetup.exe
-    if !ERRORLEVEL! NEQ 0 goto Error
-)
-
 rem Rename the installer to match the publishing convention
 ren %INSTALLER_FOLDER%\MoonlightSetup.exe MoonlightSetup-%VERSION%.exe
 
diff --git a/wix/Moonlight/Moonlight.wixproj b/wix/Moonlight/Moonlight.wixproj
index 0fc48934..009776bf 100644
--- a/wix/Moonlight/Moonlight.wixproj
+++ b/wix/Moonlight/Moonlight.wixproj
@@ -20,6 +20,12 @@
     </HarvestDirectory>
     <BindPath Include="$(DEPLOY_FOLDER)" />
   </ItemGroup>
+  <PropertyGroup Condition="$(SIGN)!=''">
+    <SignOutput>true</SignOutput>
+  </PropertyGroup>
+  <Target Name="SignMsi">
+    <Exec Command='signtool.exe $(SIGNTOOL_PARAMS) %(SignMsi.FullPath)' />
+  </Target>
   <ItemGroup>
     <PackageReference Include="WixToolset.Firewall.wixext" Version="4.*" />
     <PackageReference Include="WixToolset.Util.wixext" Version="4.*" />
diff --git a/wix/MoonlightSetup/MoonlightSetup.wixproj b/wix/MoonlightSetup/MoonlightSetup.wixproj
index 5dc893be..0c7869f2 100644
--- a/wix/MoonlightSetup/MoonlightSetup.wixproj
+++ b/wix/MoonlightSetup/MoonlightSetup.wixproj
@@ -9,6 +9,15 @@
     <OutputPath>$(INSTALLER_FOLDER)\</OutputPath>
     <IntermediateOutputPath>$(BUILD_FOLDER)\</IntermediateOutputPath>
   </PropertyGroup>
+  <PropertyGroup Condition="$(SIGN)!=''">
+    <SignOutput>true</SignOutput>
+  </PropertyGroup>
+  <Target Name="SignBundleEngine">
+    <Exec Command='signtool.exe $(SIGNTOOL_PARAMS) %(SignBundleEngine.FullPath)' />
+  </Target>
+  <Target Name="SignBundle">
+    <Exec Command='signtool.exe $(SIGNTOOL_PARAMS) %(SignBundle.FullPath)' />
+  </Target>
   <ItemGroup>
     <PackageReference Include="WixToolset.Bal.wixext" Version="4.*" />
     <PackageReference Include="WixToolset.Util.wixext" Version="4.*" />