diff --git a/cmake/Packaging.cmake b/cmake/Packaging.cmake
index 04067b3b6d4..76aaec21271 100644
--- a/cmake/Packaging.cmake
+++ b/cmake/Packaging.cmake
@@ -52,7 +52,7 @@ endmacro()
#
macro(configure_windows_packaging)
- set(QT_PATH $ENV{CMAKE_PREFIX_PATH})
+ cmake_path(SET QT_PATH NORMALIZE "${Qt6_DIR}../../")
set(DESKFLOW_MSI_64_GUID
"027D1C8A-E7A5-4754-BB93-B2D45BFDBDC8"
diff --git a/res/dist/wix/Product.wxs b/res/dist/wix/Product.wxs
index 5c364f3d6dc..c1b932d0205 100644
--- a/res/dist/wix/Product.wxs
+++ b/res/dist/wix/Product.wxs
@@ -1,154 +1,167 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- = 602)]]>
-
-
-
-
-
-
-
- CommonBackground
-
-
-
-
-
-
-
-
-
-
-
- NOT LEGACY_UNINSTALL_EXISTS
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ = 602)]]>
+
+
+
+
+
+
+
+ CommonBackground
+
+
+
+
+
+
+
+
+
+
+
+ NOT LEGACY_UNINSTALL_EXISTS
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+