diff --git a/.github/workflows/windows-artifacts.yml b/.github/workflows/windows-artifacts.yml
index 71a1512855..f3b153f8ca 100644
--- a/.github/workflows/windows-artifacts.yml
+++ b/.github/workflows/windows-artifacts.yml
@@ -21,7 +21,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: ['windows-2022']
+        os: ['windows-2025']
         go: ['1.24']
     steps:
       - name: Check out repository code
@@ -30,9 +30,8 @@ jobs:
         uses: actions/setup-go@v6
         with:
           go-version: ${{ matrix.go }}
-      - name: Set path for heat.exe and light.exe
-        shell: bash
-        run: echo "$WIX\\bin" >>$GITHUB_PATH
+      - name: Install DotNet.SDK.10
+        run: winget install --id Microsoft.DotNet.SDK.10 --source winget
       - name: Build Windows installer
         run: make out/windows-amd64/crc-windows-installer.zip
       - name: Upload windows installer artifact
diff --git a/Makefile b/Makefile
index 3dd093d825..575242c844 100644
--- a/Makefile
+++ b/Makefile
@@ -363,32 +363,21 @@ $(BUILD_DIR)/macos-universal/crc-macos-installer.tar: packagedir
 	     -e 's/__OPENSHIFT_VERSION__/'$(OPENSHIFT_VERSION)'/g' \
 	     $< >$@
 
-$(HOST_BUILD_DIR)/GenMsiWxs: packaging/windows/gen_msi_wxs.go
-	go build -o $@ -ldflags="-X main.crcVersion=$(CRC_VERSION)" $<
 
 CRC_EXE=crc.exe
-BUNDLE_NAME=crc_hyperv_$(OPENSHIFT_VERSION).$(BUNDLE_EXTENSION)
-
 .PHONY: msidir
-msidir: clean_windows_msi embed-download-windows $(HOST_BUILD_DIR)/GenMsiWxs windows-release-binary $(PACKAGE_DIR)/product.wxs.template
-	mkdir -p $(PACKAGE_DIR)/msi
-	cp $(EMBED_DOWNLOAD_DIR)/* $(PACKAGE_DIR)/msi
-	cp $(HOST_BUILD_DIR)/crc.exe $(PACKAGE_DIR)/msi/$(CRC_EXE)
-	$(HOST_BUILD_DIR)/GenMsiWxs
-	cp -r $(PACKAGE_DIR)/Resources $(PACKAGE_DIR)/msi/
-	cp $(PACKAGE_DIR)/*.wxs $(PACKAGE_DIR)/msi
-	rm $(PACKAGE_DIR)/product.wxs
+msidir: clean_windows_msi embed-download-windows windows-release-binary
+	cp $(EMBED_DOWNLOAD_DIR)/* $(PACKAGE_DIR)/
+	cp $(HOST_BUILD_DIR)/crc.exe $(PACKAGE_DIR)/
 
 $(BUILD_DIR)/windows-amd64/crc-windows-amd64.msi: msidir
-	candle.exe -arch x64 -ext WixUtilExtension -o $(PACKAGE_DIR)/msi/ $(PACKAGE_DIR)/msi/*.wxs
-	light.exe -ext WixUIExtension -ext WixUtilExtension -sacl -spdb -sice:ICE61 -sice:ICE69 -b $(PACKAGE_DIR)/msi -loc $(PACKAGE_DIR)/WixUI_en.wxl -out $@ $(PACKAGE_DIR)/msi/*.wixobj
+	dotnet build $(PACKAGE_DIR)/crc-installer.wixproj --property:DefineConstants="Version=$(CRC_VERSION)" --output $(HOST_BUILD_DIR)
 
-CABS_MSI = "*.cab,crc-windows-amd64.msi"
+MSI=$(HOST_BUILD_DIR)/crc-windows-amd64.msi
 $(BUILD_DIR)/windows-amd64/crc-windows-installer.zip: $(BUILD_DIR)/windows-amd64/crc-windows-amd64.msi
 	rm -f $(HOST_BUILD_DIR)/crc.exe
 	rm -f $(HOST_BUILD_DIR)/crc-embedder
-	rm -f $(HOST_BUILD_DIR)/split
-	pwsh -NoProfile -Command "cd $(HOST_BUILD_DIR); Compress-Archive -Path $(CABS_MSI) -DestinationPath crc-windows-installer.zip"
+	pwsh -NoProfile -Command 'Compress-Archive -Path "$(MSI)" -DestinationPath $(HOST_BUILD_DIR)/crc-windows-installer.zip'
 	cd $(@D) && sha256sum $(@F)>$(@F).sha256sum
 
 .PHONY: choco choco-clean
diff --git a/packaging/.gitignore b/packaging/.gitignore
index 740f71a376..c5eb41fb5f 100644
--- a/packaging/.gitignore
+++ b/packaging/.gitignore
@@ -8,7 +8,6 @@
 /darwin/VERSION
 /darwin/*.pkg
 /windows/msi/
-/windows/product.wxs
 /chocolatey/crc/*.nupkg
 /chocolatey/crc/crc.nuspec
 /chocolatey/crc/tools/*.exe
diff --git a/packaging/windows/LicenseAgreementDlg_HK.wxs b/packaging/windows/LicenseAgreementDlg_HK.wxs
index 7a39ef6567..2344f250b7 100755
--- a/packaging/windows/LicenseAgreementDlg_HK.wxs
+++ b/packaging/windows/LicenseAgreementDlg_HK.wxs
@@ -1,30 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
    <Fragment>
       <UI>
          <Dialog Id="LicenseAgreementDlg_HK" Width="370" Height="270" Title="!(loc.LicenseAgreementDlg_Title)">
-            <Control Id="LicenseAcceptedCheckBox" Type="CheckBox" X="20" Y="207" Width="330" Height="18" CheckBoxValue="1" Property="LicenseAccepted"
-            Text="!(loc.LicenseAgreementDlgLicenseAcceptedCheckBox)" />
+            <Control Id="LicenseAcceptedCheckBox" Type="CheckBox" X="20" Y="207" Width="330" Height="18" CheckBoxValue="1" Property="LicenseAccepted" Text="!(loc.LicenseAgreementDlgLicenseAcceptedCheckBox)" />
             <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)" />
-            <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.WixUINext)">
-               <Publish Event="SpawnWaitDialog" Value="WaitForCostingDlg">CostingComplete = 1</Publish>
-               <Condition Action="disable"><![CDATA[LicenseAccepted <> "1"]]></Condition>
-               <Condition Action="enable">LicenseAccepted = "1"</Condition>
+            <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.WixUINext)" DisableCondition="LicenseAccepted &lt;&gt; &quot;1&quot;" EnableCondition="LicenseAccepted = &quot;1&quot;">
+               <Publish Event="SpawnWaitDialog" Value="WaitForCostingDlg" Condition="CostingComplete = 1" />
             </Control>
             <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
-               <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
+               <Publish Event="SpawnDialog" Value="CancelDlg" />
             </Control>
             <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.LicenseAgreementDlgBannerBitmap)" />
             <Control Id="LicenseText" Type="ScrollableText" X="20" Y="60" Width="330" Height="140" Sunken="yes" TabSkip="no">
-
-            
-            <Text SourceFile="./Resources/LICENSE.rtf" />
-            
-
-            </Control>
-            <Control Id="Print" Type="PushButton" X="112" Y="243" Width="56" Height="17" Text="!(loc.WixUIPrint)">
-               <Publish Event="DoAction" Value="WixUIPrintEula">1</Publish>
+               <Text SourceFile="./Resources/LICENSE.rtf" />
             </Control>
             <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
             <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
@@ -34,3 +22,4 @@
       </UI>
    </Fragment>
 </Wix>
+
diff --git a/packaging/windows/WixUI_HK.wxs b/packaging/windows/WixUI_HK.wxs
index 074dade06a..fc307f7092 100755
--- a/packaging/windows/WixUI_HK.wxs
+++ b/packaging/windows/WixUI_HK.wxs
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
    <Fragment>
 
       <UI Id="WixUI_HK">
@@ -12,7 +11,6 @@
          <Property Id="ARPNOMODIFY" Value="1" />
          <Property Id="ARPNOREPAIR" Value="1" />
 
-         <DialogRef Id="BrowseDlg" />
          <DialogRef Id="DiskCostDlg" />
          <DialogRef Id="ErrorDlg" />
          <DialogRef Id="FatalError" />
@@ -25,48 +23,49 @@
 
          <!--   Make sure to include custom dialogs in the installer database via a DialogRef command,
                especially if they are not included explicitly in the publish chain below -->
-         <DialogRef Id="LicenseAgreementDlg_HK"/>
+         <DialogRef Id="LicenseAgreementDlg_HK" />
 
          <!-- Custom dialog to ask for removal of old version if an upgrade is detected -->
          <Dialog Id="OldVersionDlg" Width="240" Height="95" Title="[ProductName] Setup" NoMinimize="yes">
             <Control Id="Text" Type="Text" X="28" Y="15" Width="194" Height="50">
-               <Text>A previous version of Red Hat OpenShift Local is currently installed. By continuing the installation this version will be uninstalled. Do you want to continue?</Text>
+               <Text Value="A previous version of Red Hat OpenShift Local is currently installed. By continuing the installation this version will be uninstalled. Do you want to continue?" />
             </Control>
             <Control Id="Exit" Type="PushButton" X="123" Y="67" Width="62" Height="17" Default="yes" Cancel="yes" Text="No, Exit">
-               <Publish Event="EndDialog" Value="Exit">1</Publish>
+               <Publish Event="EndDialog" Value="Exit" />
             </Control>
             <Control Id="Next" Type="PushButton" X="55" Y="67" Width="62" Height="17" Text="Yes, Uninstall">
-               <Publish Event="EndDialog" Value="Return">1</Publish>
+               <Publish Event="EndDialog" Value="Return" />
             </Control>
          </Dialog>
 
-         <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish>
+         <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999" />
 
-         <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="OldVersionDlg"><![CDATA[CRCINSTALLED << "#1"]]></Publish>
-         <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="LicenseAgreementDlg_HK"><![CDATA[NOT (CRCINSTALLED << "#1")]]></Publish>
+         <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="OldVersionDlg" Condition="CRCINSTALLED &lt;&lt; &quot;#1&quot;" />
+         <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="LicenseAgreementDlg_HK" Condition="NOT (CRCINSTALLED &lt;&lt; &quot;#1&quot;)" />
 
-         <Publish Dialog="OldVersionDlg" Control="Next" Event="NewDialog" Value="LicenseAgreementDlg_HK">1</Publish>
+         <Publish Dialog="OldVersionDlg" Control="Next" Event="NewDialog" Value="LicenseAgreementDlg_HK" />
 
-         <Publish Dialog="LicenseAgreementDlg_HK" Control="Back" Event="NewDialog" Value="WelcomeDlg">1</Publish>
-         <Publish Dialog="LicenseAgreementDlg_HK" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">LicenseAccepted = "1"</Publish>
+         <Publish Dialog="LicenseAgreementDlg_HK" Control="Back" Event="NewDialog" Value="WelcomeDlg" />
+         <Publish Dialog="LicenseAgreementDlg_HK" Control="Next" Event="NewDialog" Value="VerifyReadyDlg" Condition="LicenseAccepted = &quot;1&quot;" />
 
-         <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="LicenseAgreementDlg_HK">NOT Installed</Publish>
-         <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg">Installed</Publish>
+         <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="LicenseAgreementDlg_HK" Condition="NOT Installed" />
+         <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Condition="Installed" />
 
-         <Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish>
+         <Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlg" />
 
-         <Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
-         <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
-         <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg">1</Publish>
+         <Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlg" />
+         <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg" />
+         <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg" />
       </UI>
 
       <UIRef Id="WixUI_Common" />
 
-      <CustomAction Id="CA_Set_WIXUI_EXITDIALOGOPTIONALTEXT" Property="WIXUI_EXITDIALOGOPTIONALTEXT" Value="To finish installation of  [ProductName] please restart your computer."/>
-      <CustomAction Id="CA_Set_WIXUI_EXITDIALOGOPTIONALTEXT_NOREBOOT" Property="WIXUI_EXITDIALOGOPTIONALTEXT" Value="Suceesfully installed [ProductName]."/>
+      <CustomAction Id="CA_Set_WIXUI_EXITDIALOGOPTIONALTEXT" Property="WIXUI_EXITDIALOGOPTIONALTEXT" Value="To finish installation of [ProductName] please restart your computer." />
+      <CustomAction Id="CA_Set_WIXUI_EXITDIALOGOPTIONALTEXT_NOREBOOT" Property="WIXUI_EXITDIALOGOPTIONALTEXT" Value="Successfully installed [ProductName]." />
       <InstallUISequence>
-         <Custom Action="CA_Set_WIXUI_EXITDIALOGOPTIONALTEXT" After="FindRelatedProducts"><![CDATA[NOT WIX_UPGRADE_DETECTED]]></Custom>
-         <Custom Action="CA_Set_WIXUI_EXITDIALOGOPTIONALTEXT_NOREBOOT" After="FindRelatedProducts"><![CDATA[WIX_UPGRADE_DETECTED]]></Custom>
+         <Custom Action="CA_Set_WIXUI_EXITDIALOGOPTIONALTEXT" After="FindRelatedProducts" Condition="NOT WIX_UPGRADE_DETECTED" />
+         <Custom Action="CA_Set_WIXUI_EXITDIALOGOPTIONALTEXT_NOREBOOT" After="FindRelatedProducts" Condition="WIX_UPGRADE_DETECTED" />
       </InstallUISequence>
    </Fragment>
 </Wix>
+
diff --git a/packaging/windows/WixUI_en.wxl b/packaging/windows/WixUI_en.wxl
deleted file mode 100755
index 0d764e6671..0000000000
--- a/packaging/windows/WixUI_en.wxl
+++ /dev/null
@@ -1,3 +0,0 @@
-<WixLocalization Culture="en-US" Codepage="1252"  xmlns="http://schemas.microsoft.com/wix/2006/localization">
-    <String Id="WelcomeDlgDescription">The Setup Wizard will install [ProductName] at [INSTALLDIR] on your computer. Click Next to continue or Cancel to exit the Setup Wizard.</String>
-</WixLocalization>
\ No newline at end of file
diff --git a/packaging/windows/crc-installer.wixproj b/packaging/windows/crc-installer.wixproj
new file mode 100644
index 0000000000..cc84c95e0f
--- /dev/null
+++ b/packaging/windows/crc-installer.wixproj
@@ -0,0 +1,20 @@
+<Project Sdk="WixToolset.Sdk/5.0.2">
+  <PropertyGroup>
+    <OutputType>Package</OutputType>
+    <OutputName>crc-windows-amd64</OutputName>
+    <Platform>x64</Platform>
+    <SuppressIces>ICE61</SuppressIces>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <AppendCultureToOutputPath>false</AppendCultureToOutputPath>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Util.wixext" Version="5.0.2" />
+    <PackageReference Include="WixToolset.UI.wixext" Version="5.0.2" />
+  </ItemGroup>
+</Project>
+
diff --git a/packaging/windows/gen_msi_wxs.go b/packaging/windows/gen_msi_wxs.go
deleted file mode 100755
index 4b73e1b337..0000000000
--- a/packaging/windows/gen_msi_wxs.go
+++ /dev/null
@@ -1,45 +0,0 @@
-package main
-
-import (
-	"log"
-	"os"
-	"strings"
-	"text/template"
-)
-
-var crcVersion = "unset" // version set at compile time
-
-func main() {
-	if len(os.Args) != 1 {
-		log.Fatal("Split takes only one argument (the file to split)")
-	}
-
-	if err := generateWxsFromTemplate(); err != nil {
-		log.Fatalf("Wxs generation failed: %s", err)
-	}
-}
-
-func generateWxsFromTemplate() error {
-	tmpl := template.New("product.wxs.template")
-	tmpl.Funcs(template.FuncMap{
-		"strjoin": strings.Join,
-		"inc":     func(val int) int { return val + 1 },
-	})
-	tmpl, err := tmpl.ParseFiles("packaging/windows/product.wxs.template")
-	if err != nil {
-		return err
-	}
-	type templateData struct {
-		Version string
-	}
-	tmplData := templateData{
-		Version: crcVersion,
-	}
-
-	f, err := os.OpenFile("packaging/windows/product.wxs", os.O_CREATE|os.O_RDWR, 0644)
-	if err != nil {
-		return err
-	}
-	defer f.Close()
-	return tmpl.Execute(f, tmplData)
-}
diff --git a/packaging/windows/product.wxs b/packaging/windows/product.wxs
new file mode 100755
index 0000000000..3be30b1892
--- /dev/null
+++ b/packaging/windows/product.wxs
@@ -0,0 +1,130 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+
+    <?ifndef Version?>
+        <?error Version must be defined via command line argument?>
+    <?endif?>
+
+    <Package UpgradeCode="53DE5BFA-0E53-44E7-8D4F-07E37E59A9AB" Name="Red Hat OpenShift Local" Version="$(Version)" Manufacturer="Red Hat Inc." Language="1033" InstallerVersion="500"><SummaryInformation Description="Red Hat OpenShift Local $(Version)" />
+        <Media Id="1" EmbedCab="yes" Cabinet="cab1.cab" />
+        <MajorUpgrade AllowDowngrades="yes" />
+        <WixVariable Id="WixUIBannerBmp" Value=".\Resources\banner.png" />
+        <WixVariable Id="WixUIDialogBmp" Value=".\Resources\background.png" />
+        <Icon Id="crcicon.ico" SourceFile=".\Resources\icon.ico" />
+        <Property Id="ARPPRODUCTICON" Value="crcicon.ico" />
+        <Property Id="CURRENTBUILD">
+            <RegistrySearch Id="CURRENTBUILDSearch" Root="HKLM" Key="SOFTWARE\Microsoft\Windows NT\CurrentVersion" Name="CurrentBuild" Type="raw" />
+        </Property>
+        <Property Id="MINIMUMBUILD" Value="16299" Secure="yes"></Property>
+        <Launch Condition="Installed OR (CURRENTBUILD &gt; MINIMUMBUILD)" Message="Red Hat OpenShift Local requires the Windows 10 Fall Creators Update (version 1709) or newer." />
+        <Property Id="WINDOWSEDITION" Secure="yes">
+            <RegistrySearch Id="WindowsEditionReg" Root="HKLM" Key="SOFTWARE\Microsoft\Windows NT\CurrentVersion" Name="EditionID" Type="raw" />
+        </Property>
+        <Launch Condition="Installed OR (WINDOWSEDITION &lt;&gt; &quot;Core&quot;)" Message="Red Hat OpenShift Local cannot run on Windows Home edition" />
+
+        <Property Id="CRCINSTALLED" Secure="yes">
+            <RegistrySearch Id="CrcInstalledReg" Root="HKCU" Key="Software\Red Hat\Red Hat OpenShift Local" Name="installed" Type="raw" />
+        </Property>
+
+        <Property Id="POWERSHELLEXE">
+            <RegistrySearch Id="POWERSHELLEXE" Type="raw" Root="HKLM" Key="SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell" Name="Path" />
+        </Property>
+
+        <Property Id="USERFOLDER">
+            <DirectorySearch Id="userProfileSearch" Depth="0" Path="[%USERPROFILE]" />
+        </Property>
+
+        <Property Id="SHAREDDIRNAME" Secure="yes" Value="crc-dir0" />
+
+        <SetProperty Action="CACreateCrcUsersGroup" Id="CreateCrcGroup" Value='"[System64Folder]cmd.exe" /c net localgroup crc-users /comment:"Group for Red Hat OpenShift Local users" /add' Before="CreateCrcGroup" Sequence="execute"/>
+        <CustomAction Id="CreateCrcGroup" DllEntry="WixQuietExec" Execute="deferred" Impersonate="no" Return="ignore" BinaryRef="Wix4UtilCA_$(sys.BUILDARCHSHORT)" />
+
+        <SetProperty Action="CARemoveCrcUsersGroup" Id="RemoveCrcGroup" Value='"[System64Folder]cmd.exe" /c net localgroup crc-users /del' Before="RemoveCrcGroup" Sequence="execute"/>
+        <CustomAction Id="RemoveCrcGroup" DllEntry="WixQuietExec" Execute="deferred" Impersonate="no" Return="ignore" BinaryRef="Wix4UtilCA_$(sys.BUILDARCHSHORT)" />
+
+        <SetProperty Action="CARemoveCrcUsersGroupRollback" Id="RemoveCrcGroupRollback" Value='"[System64Folder]cmd.exe" /c net localgroup crc-users /del' Before="RemoveCrcGroup" Sequence="execute"/>
+        <CustomAction Id="RemoveCrcGroupRollback" DllEntry="WixQuietExec" Execute="rollback" Impersonate="no" Return="ignore" BinaryRef="Wix4UtilCA_$(sys.BUILDARCHSHORT)" />
+
+        <SetProperty Action="CARemoveCrcDaemonTask" Id="RemoveCrcDaemonTask" Value="&quot;[System64Folder]cmd.exe&quot; /c schtasks /delete /TN crcDaemon /F" Before="RemoveFiles" Sequence="execute" />
+        <CustomAction Id="RemoveCrcDaemonTask" DllEntry="WixQuietExec" Execute="deferred" Impersonate="no" Return="ignore" BinaryRef="Wix4UtilCA_$(sys.BUILDARCHSHORT)" />
+
+        <SetProperty Action="CAInstallHyperv" Id="InstallHyperv" Value="&quot;[System64Folder]dism.exe&quot; /online /enable-feature /featureName:microsoft-hyper-v-all /NoRestart /quiet" Before="InstallHyperv" Sequence="execute" />
+        <CustomAction Id="InstallHyperv" DllEntry="WixQuietExec" Execute="deferred" Impersonate="no" Return="ignore" BinaryRef="Wix4UtilCA_$(sys.BUILDARCHSHORT)" />
+
+        <SetProperty Action="CARemoveSMBShare" Id="RemoveSMBShare" Value="&quot;[POWERSHELLEXE]&quot; -NonInteractive -ExecutionPolicy Bypass -NoProfile -Command &quot;Remove-SmbShare -Name '[SHAREDDIRNAME]' -Force&quot;" Before="RemoveSMBShare" Sequence="execute" />
+        <CustomAction Id="RemoveSMBShare" DllEntry="WixQuietExec" Execute="deferred" Impersonate="no" Return="ignore" BinaryRef="Wix4UtilCA_$(sys.BUILDARCHSHORT)" />
+
+        <InstallExecuteSequence>
+            <Custom Action="CreateCrcGroup" Before="Wix4ConfigureUsers_$(sys.BUILDARCHSHORT)" Condition="NOT Installed AND NOT REMOVE~=&quot;ALL&quot; AND NOT WIX_UPGRADE_DETECTED" />
+            <Custom Action="RemoveCrcGroup" After="RemoveFolders" Condition="Installed AND NOT PATCH AND REMOVE~=&quot;ALL&quot; AND NOT UPGRADINGPRODUCTCODE" />
+            <Custom Action="InstallHyperv" After="InstallFiles" Condition="NOT Installed AND NOT REMOVE~=&quot;ALL&quot; AND NOT WIX_UPGRADE_DETECTED" />
+            <Custom Action="RemoveCrcDaemonTask" Before="RemoveFiles" Condition="Installed AND NOT UPGRADINGPRODUCTCODE" />
+            <Custom Action="RemoveSMBShare" After="RemoveCrcDaemonTask" Condition="Installed AND UPGRADINGPRODUCTCODE" />
+            <Custom Action="RemoveCrcGroupRollback" After="CreateCrcGroup" Condition="NOT Installed AND NOT REMOVE~=&quot;ALL&quot; AND NOT WIX_UPGRADE_DETECTED" />
+            <ScheduleReboot After="InstallFinalize" Condition="NOT Installed AND NOT REMOVE~=&quot;ALL&quot; AND NOT WIX_UPGRADE_DETECTED" />
+        </InstallExecuteSequence>
+        <Feature Id="DefaultFeature" Title="Install core features" Level="1" AllowAbsent="no">
+            <ComponentRef Id="CrcExe" />
+            <ComponentRef Id="AdminHelper" />
+            <ComponentRef Id="BackgroundLauncher" />
+            <ComponentRef Id="AddToPath" />
+            <ComponentRef Id="VsockRegistryEntry" />
+            <ComponentRef Id="Hvsock9pRegistryEntry" />
+            <ComponentRef Id="CreateCrcUsersGroupAddUser" />
+            <ComponentRef Id="AddUserToHypervAdminsGroup" />
+        </Feature>
+        <UI>
+            <UIRef Id="WixUI_ErrorProgressText" />
+            <!-- Define the installer UI -->
+            <UIRef Id="WixUI_HK" />
+            <ProgressText Action="InstallHyperv" Message="Installing Hyper-V" />
+            <ProgressText Action="RemoveCrcDaemonTask" Message="Removing crcDaemon task" />
+            <ProgressText Action="RemoveSMBShare" Message="Removing share named: [SHAREDDIRNAME] for folder: [USERFOLDER]" />
+        </UI>
+        <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" />
+        <!-- this should help to propagate env var changes -->
+        <util:BroadcastEnvironmentChange />
+        <util:Group Id="HypervAdminsGroup" Name="Hyper-V Administrators" />
+        <util:Group Id="CrcUsersGroup" Name="crc-users" />
+        <StandardDirectory Id="ProgramFiles64Folder">
+            <Directory Id="INSTALLDIR" Name="Red Hat OpenShift Local">
+                <Component Id="CrcExe">
+                    <File Id="CrcExe" Source=".\crc.exe" KeyPath="yes" DiskId="1" />
+                    <RemoveFile Id="RemoveInstallFiles" Name="*.*" On="uninstall" />
+                </Component>
+                <Component Id="AdminHelper">
+                    <File Id="AdminHelper" Source=".\crc-admin-helper-windows.exe" KeyPath="yes" DiskId="1" />
+                    <ServiceInstall Name="crcAdminHelper" Description="Perform administrative tasks for the user" Arguments="daemon" DisplayName="Red Hat OpenShift Local Admin Helper" ErrorControl="normal" Start="auto" Type="ownProcess" />
+                    <ServiceControl Id="StartAdminHelperService" Name="crcAdminHelper" Start="install" Stop="both" Remove="uninstall" />
+                </Component>
+                <Component Id="BackgroundLauncher">
+                    <File Id="BackgroundLauncher" Source=".\win32-background-launcher.exe" Name="crc-background-launcher.exe" KeyPath="yes" DiskId="1" />
+                </Component>
+                <Component Id="AddToPath" Guid="09C1E713-44DE-44C3-BDAD-72BE10C10542">
+                    <CreateFolder />
+                    <Environment Id="PATH" Name="PATH" Value="[INSTALLDIR]" Permanent="no" Part="last" Action="set" System="yes" />
+                </Component>
+                <Component Id="VsockRegistryEntry">
+                    <RegistryKey Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion\Virtualization\GuestCommunicationServices\00000400-FACB-11E6-BD58-64006A7986D3">
+                        <RegistryValue Type="string" Name="ElementName" Value="gvisor-tap-vsock" KeyPath="yes" />
+                    </RegistryKey>
+                </Component>
+                <Component Id="Hvsock9pRegistryEntry" Guid="*">
+                    <RegistryKey Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion\Virtualization\GuestCommunicationServices\00009000-FACB-11E6-BD58-64006A7986D3">
+                        <RegistryValue Type="string" Name="ElementName" Value="fs9p-hvsock" KeyPath="yes"/>
+                    </RegistryKey>
+                </Component>
+                <Component Id="CreateCrcUsersGroupAddUser" Guid="12DCE321-8645-43ED-9059-3DC5828A3B13">
+                    <util:User Id="CurrentUserCrcUsers" Name="[LogonUser]" Domain="[%USERDOMAIN]" CreateUser="no" FailIfExists="no">
+                        <util:GroupRef Id="CrcUsersGroup" />
+                    </util:User>
+                </Component>
+                <Component Id="AddUserToHypervAdminsGroup" Guid="CEE06E47-C46E-410E-9951-C5A4004198E6">
+                    <util:User Id="CurrentUserHypervAdmins" Name="[LogonUser]" Domain="[%USERDOMAIN]" CreateUser="no" FailIfExists="no" >
+                        <util:GroupRef Id="HypervAdminsGroup" />
+                    </util:User>
+                </Component>
+            </Directory>
+        </StandardDirectory>
+    </Package>
+</Wix>
+
diff --git a/packaging/windows/product.wxs.template b/packaging/windows/product.wxs.template
deleted file mode 100755
index a04b19fd06..0000000000
--- a/packaging/windows/product.wxs.template
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
-    xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
-    <Product Id="*" UpgradeCode="53DE5BFA-0E53-44E7-8D4F-07E37E59A9AB" Name="Red Hat OpenShift Local" Version="{{.Version}}" Manufacturer="Red Hat Inc." Language="1033">
-        <Package Id ="*" InstallerVersion="300" Compressed="yes" Description="Red Hat OpenShift Local {{.Version}}" Comments="This installs Red Hat OpenShift Local {{.Version}}" InstallScope="perMachine" />
-	    <Media Id="1" EmbedCab="yes" Cabinet="cab1.cab"/>
-        <MajorUpgrade AllowDowngrades="yes" />
-        <WixVariable Id="WixUIBannerBmp" Value=".\Resources\banner.png"/>
-        <WixVariable Id="WixUIDialogBmp" Value=".\Resources\background.png"/>
-        <Icon Id="crcicon.ico" SourceFile=".\Resources\icon.ico"/>
-        <Property Id="ARPPRODUCTICON" Value="crcicon.ico"/>
-        <Property Id="CURRENTBUILD">
-            <RegistrySearch Id="CURRENTBUILDSearch" Root="HKLM" Key="SOFTWARE\Microsoft\Windows NT\CurrentVersion" Name="CurrentBuild" Type="raw"/>
-        </Property>
-        <Property Id="MINIMUMBUILD" Value="1709" Secure="yes"></Property>
-        <Condition Message="Red Hat OpenShift Local requires the Windows 10 Fall Creators Update (version 1709) or newer.">
-            <![CDATA[Installed OR (CURRENTBUILD > MINIMUMBUILD)]]>
-        </Condition>
-        <Property Id="WINDOWSEDITION" Secure="yes">
-            <RegistrySearch Id="WindowsEditionReg" Root="HKLM" Key="SOFTWARE\Microsoft\Windows NT\CurrentVersion" Name="EditionID" Type="raw" />
-        </Property>
-        <Condition Message="Red Hat OpenShift Local cannot run on Windows Home edition">
-            <![CDATA[Installed OR (WINDOWSEDITION <> "Core")]]>
-        </Condition>
-
-        <Property Id="CRCINSTALLED" Secure="yes">
-            <RegistrySearch Id="CrcInstalledReg" Root="HKCU" Key="Software\Red Hat\Red Hat OpenShift Local" Name="installed" Type="raw" />
-        </Property>
-
-        <Property Id="POWERSHELLEXE">
-            <RegistrySearch Id="POWERSHELLEXE"
-                Type="raw"
-                Root="HKLM"
-                Key="SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell"
-                Name="Path" />
-        </Property>
-
-        <util:Group Id="CrcUsersGroup" Name="crc-users" />
-        <Directory Id="TARGETDIR" Name="SourceDir">
-            <Directory Id="ProgramFiles64Folder">
-                <Directory Id="INSTALLDIR" Name="Red Hat OpenShift Local">
-                    <Component Id="CrcExe" Guid="*">
-                        <File Id="CrcExe" Source="SourceDir\crc.exe" KeyPath="yes" DiskId="1" />
-                        <RemoveFile Id="RemoveInstallFiles" Name="*.*" On="uninstall" />
-                    </Component>
-                    <Component Id="AdminHelper" Guid="*">
-                        <File Id="AdminHelper" Source="SourceDir\crc-admin-helper-windows.exe" KeyPath="yes" DiskId="1" />
-                        <ServiceInstall Name="crcAdminHelper" Description="Perform administrative tasks for the user" Arguments="daemon" DisplayName="Red Hat OpenShift Local Admin Helper" ErrorControl="normal" Start="auto" Type="ownProcess" />
-                        <ServiceControl Id="StartAdminHelperService" Name="crcAdminHelper" Start='install' Stop='both' Remove='uninstall' />
-                    </Component>
-                    <Component Id="BackgroundLauncher" Guid="*">
-                        <File Id="BackgroundLauncher" Source="SourceDir\win32-background-launcher.exe" Name="crc-background-launcher.exe" KeyPath="yes" DiskId="1" />
-                    </Component>
-                    <Component Id="AddUserToCrcUsers" Guid="0C793EE7-109A-474B-9651-77E0A83BAF2D" KeyPath="yes">
-                        <Condition>NOT UPGRADINGPRODUCTCODE AND NOT WIX_UPGRADE_DETECTED</Condition>
-                        <util:User Id="LogonUser1" Domain="[%USERDOMAIN]" Name="[LogonUser]" CreateUser="no" RemoveOnUninstall="no">
-                            <util:GroupRef Id="CrcUsersGroup" />
-                        </util:User>
-                    </Component>
-                    <Component Id="AddToPath" Guid="09C1E713-44DE-44C3-BDAD-72BE10C10542">
-                        <CreateFolder />
-                        <Environment Id="PATH" Name="PATH" Value="[INSTALLDIR]" Permanent="no" Part="last" Action="set" System="yes" />
-                    </Component>
-                    <Component Id="VsockRegistryEntry" Guid="*">
-                        <RegistryKey Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion\Virtualization\GuestCommunicationServices\00000400-FACB-11E6-BD58-64006A7986D3">
-                            <RegistryValue Type="string" Name="ElementName" Value="gvisor-tap-vsock" KeyPath="yes"/>
-                        </RegistryKey>
-                    </Component>
-                    <Component Id="Hvsock9pRegistryEntry" Guid="*">
-                        <RegistryKey Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion\Virtualization\GuestCommunicationServices\00009000-FACB-11E6-BD58-64006A7986D3">
-                            <RegistryValue Type="string" Name="ElementName" Value="fs9p-hvsock" KeyPath="yes"/>
-                        </RegistryKey>
-                    </Component>
-                </Directory>
-            </Directory>
-        </Directory>
-
-        <SetProperty Action="CACreateCrcUsersGroup" Id="CreateCrcGroup" Value='"[System64Folder]cmd.exe" /c net localgroup crc-users /comment:"Group for Red Hat OpenShift Local users" /add' Before="CreateCrcGroup" Sequence="execute"/>
-        <CustomAction Id="CreateCrcGroup" BinaryKey="WixCA" DllEntry="WixQuietExec" Execute="deferred" Impersonate="no" Return="ignore" />
-        <SetProperty Action="CARemoveCrcUsersGroup" Id="RemoveCrcGroup" Value='"[System64Folder]cmd.exe" /c net localgroup crc-users /del' Before="RemoveCrcGroup" Sequence="execute"/>
-        <CustomAction Id="RemoveCrcGroup" BinaryKey="WixCA" DllEntry="WixQuietExec" Execute="deferred" Impersonate="no" Return="ignore" />
-        <SetProperty Action="CARemoveCrcUsersGroupRollback" Id="RemoveCrcGroupRollback" Value='"[System64Folder]cmd.exe" /c net localgroup crc-users /del' Before="RemoveCrcGroup" Sequence="execute"/>
-        <CustomAction Id="RemoveCrcGroupRollback" BinaryKey="WixCA" DllEntry="WixQuietExec" Execute="rollback" Impersonate="no" Return="ignore" />
-        <SetProperty Action="CARemoveCrcDaemonTask" Id="RemoveCrcDaemonTask" Value='"[System64Folder]cmd.exe" /c schtasks /delete /TN crcDaemon /F' Before='RemoveFiles' Sequence="execute"/>
-        <CustomAction Id="RemoveCrcDaemonTask" BinaryKey="WixCA" DllEntry="WixQuietExec" Execute="deferred" Impersonate="no" Return="ignore" />
-        <SetProperty Action="CAInstallHyperv" Id="InstallHyperv" Value='"[System64Folder]dism.exe" /online /enable-feature /featureName:microsoft-hyper-v-all /NoRestart /quiet' Before="InstallHyperv" Sequence="execute"/>
-        <CustomAction Id="InstallHyperv" BinaryKey="WixCA" DllEntry="WixQuietExec64" Execute="deferred" Impersonate="no" Return="ignore" />
-        <SetProperty Action="CAAddUserToHypervAdminGroup"
-            Id="AddUserToHypervAdminGroup"
-            Value="&quot;[POWERSHELLEXE]&quot; -NonInteractive -ExecutionPolicy Bypass -NoProfile -Command &quot;Add-LocalGroupMember -Member '[LogonUser]' -SID S-1-5-32-578&quot;"
-            Before="AddUserToHypervAdminGroup"
-            Sequence="execute"/>
-        <CustomAction Id="AddUserToHypervAdminGroup" BinaryKey="WixCA" DllEntry="WixQuietExec64" Execute="deferred" Impersonate="no" Return="ignore" />
-
-        <InstallExecuteSequence>
-            <Custom Action="CreateCrcGroup" Before="ConfigureUsers"> NOT Installed AND NOT REMOVE~="ALL" AND NOT WIX_UPGRADE_DETECTED</Custom>
-            <Custom Action="AddUserToHypervAdminGroup" After="InstallHyperv"> NOT Installed AND NOT REMOVE~="ALL" AND NOT WIX_UPGRADE_DETECTED</Custom>
-            <Custom Action="RemoveCrcGroup" After="RemoveFolders"> Installed AND NOT PATCH AND REMOVE~="ALL" AND NOT UPGRADINGPRODUCTCODE</Custom>
-            <Custom Action="InstallHyperv" Before="CreateCrcGroup"> NOT Installed AND NOT REMOVE~="ALL" AND NOT WIX_UPGRADE_DETECTED</Custom>
-            <Custom Action="RemoveCrcGroupRollback" After="CreateCrcGroup"> NOT Installed AND NOT REMOVE~="ALL" AND NOT WIX_UPGRADE_DETECTED</Custom>
-            <Custom Action="RemoveCrcDaemonTask" Before='RemoveFiles'>Installed AND NOT UPGRADINGPRODUCTCODE</Custom>
-            <ScheduleReboot After="InstallFinalize"> NOT Installed AND NOT REMOVE~="ALL" AND NOT WIX_UPGRADE_DETECTED</ScheduleReboot>
-        </InstallExecuteSequence>
-        <Feature Id="DefaultFeature" Title="Install core features" Absent="disallow" Level="1">
-            <ComponentRef Id="CrcExe" />
-            <ComponentRef Id="AdminHelper" />
-            <ComponentRef Id="BackgroundLauncher" />
-            <ComponentRef Id="AddToPath"/>
-            <ComponentRef Id="AddUserToCrcUsers" />
-            <ComponentRef Id="VsockRegistryEntry" />
-            <ComponentRef Id="Hvsock9pRegistryEntry" />
-        </Feature>
-        <UI>
-            <UIRef Id="WixUI_ErrorProgressText"/>
-            <!-- Define the installer UI -->
-            <UIRef Id="WixUI_HK"/>
-            <ProgressText Action="CreateCrcGroup">Creating crc-users group</ProgressText>
-            <ProgressText Action="RemoveCrcGroup">Removing crc-users group</ProgressText>
-            <ProgressText Action="InstallHyperv">Installing Hyper-V</ProgressText>
-            <ProgressText Action="AddUserToHypervAdminGroup">Adding user: [LogonUser] to Hyper-V Administrators group</ProgressText>
-            <ProgressText Action="RemoveCrcDaemonTask">Removing crcDaemon task</ProgressText>
-        </UI>
-        <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" />
-        <!-- this should help to propagate env var changes -->
-        <CustomActionRef Id="WixBroadcastEnvironmentChange" />
-    </Product>
-</Wix>