diff --git a/cmake/macros/SetPackagingParameters.cmake b/cmake/macros/SetPackagingParameters.cmake
index 321f855ec7..21075fa0b8 100644
--- a/cmake/macros/SetPackagingParameters.cmake
+++ b/cmake/macros/SetPackagingParameters.cmake
@@ -71,7 +71,7 @@ macro(SET_PACKAGING_PARAMETERS)
     endif ()
 
     set(GENERATED_UNINSTALLER_EXEC_NAME "Uninstall.exe")
-    set(REGISTRY_HKLM_INSTALL_ROOT "Software\\Microsoft\\Windows\\CurrentVersion\\Install")
+    set(REGISTRY_HKLM_INSTALL_ROOT "Software")
     set(POST_INSTALL_OPTIONS_REG_GROUP "PostInstallOptions")
     set(CLIENT_DESKTOP_SHORTCUT_REG_KEY "ClientDesktopShortcut")
     set(CONSOLE_DESKTOP_SHORTCUT_REG_KEY "ConsoleDesktopShortcut")
diff --git a/cmake/templates/CPackProperties.cmake.in b/cmake/templates/CPackProperties.cmake.in
index 87092b83f5..c4d06c64a4 100644
--- a/cmake/templates/CPackProperties.cmake.in
+++ b/cmake/templates/CPackProperties.cmake.in
@@ -20,8 +20,9 @@ set(CLIENT_COMPONENT_NAME "@CLIENT_COMPONENT@")
 set(SERVER_COMPONENT_NAME "@SERVER_COMPONENT@")
 set(SIGNTOOL_EXECUTABLE "@SIGNTOOL_EXECUTABLE@")
 set(UNINSTALLER_NAME "@GENERATED_UNINSTALLER_EXEC_NAME@")
+set(REGISTRY_HKLM_INSTALL_ROOT "@REGISTRY_HKLM_INSTALL_ROOT@")
+set(POST_INSTALL_OPTIONS_REG_GROUP "@POST_INSTALL_OPTIONS_REG_GROUP@")
 set(CLIENT_DESKTOP_SHORTCUT_REG_KEY "@CLIENT_DESKTOP_SHORTCUT_REG_KEY@")
 set(CONSOLE_DESKTOP_SHORTCUT_REG_KEY "@CONSOLE_DESKTOP_SHORTCUT_REG_KEY@")
 set(CONSOLE_STARTUP_REG_KEY "@CONSOLE_STARTUP_SHORTCUT_REG_KEY@")
 set(LAUNCH_NOW_REG_KEY "@LAUNCH_NOW_REG_KEY@")
-set(REGISTRY_HKLM_INSTALL_ROOT "@REGISTRY_HKLM_INSTALL_ROOT@")