diff --git a/packaging/NSIS/Ultimaker-Cura.nsi.jinja b/packaging/NSIS/Ultimaker-Cura.nsi.jinja
index b7a50674ed..3776f843db 100644
--- a/packaging/NSIS/Ultimaker-Cura.nsi.jinja
+++ b/packaging/NSIS/Ultimaker-Cura.nsi.jinja
@@ -1,10 +1,11 @@
 # Copyright (c) 2022 Ultimaker B.V.
 # Cura's build system is released under the terms of the AGPLv3 or higher.
 
-!define APP_NAME "{{ app_name }} {{ version_major }}.{{ version_minor }}.{{ version_patch }}"
+!define APP_NAME "{{ app_name }} {{ version_major }}.{{ version_minor }}.{{ version_patch }}.{{ version_build }}"
 !define COMP_NAME "{{ company }}"
 !define WEB_SITE "{{ web_site }}"
 !define VERSION "{{ version_major }}.{{ version_minor }}.{{ version_patch }}.{{ version_build }}"
+!define VIVERSION "{{ version_major }}.{{ version_minor }}.{{ version_patch }}.0"
 !define COPYRIGHT "Copyright (c) {{ year }} {{ company }}"
 !define DESCRIPTION "Application"
 !define LICENSE_TXT "{{ cura_license_file }}"
@@ -24,12 +25,12 @@ var SM_Folder
 
 ######################################################################
 
-VIProductVersion  "${VERSION}"
+VIProductVersion  "${VIVERSION}"
 VIAddVersionKey "ProductName"  "{{ app_name }}"
 VIAddVersionKey "CompanyName"  "${COMP_NAME}"
 VIAddVersionKey "LegalCopyright"  "${COPYRIGHT}"
 VIAddVersionKey "FileDescription"  "${DESCRIPTION}"
-VIAddVersionKey "FileVersion"  "${VERSION}"
+VIAddVersionKey "FileVersion"  "${VIVERSION}"
 
 ######################################################################
 
@@ -38,7 +39,6 @@ Name "${APP_NAME}"
 Caption "${APP_NAME}"
 OutFile "${INSTALLER_NAME}"
 BrandingText "${APP_NAME}"
-InstallDirRegKey "${REG_ROOT}" "${REG_APP_PATH}" ""
 InstallDir "$PROGRAMFILES64\${APP_NAME}"
 
 ######################################################################
diff --git a/packaging/NSIS/create_windows_installer.py b/packaging/NSIS/create_windows_installer.py
index a7c1904d02..519c8f0a7f 100644
--- a/packaging/NSIS/create_windows_installer.py
+++ b/packaging/NSIS/create_windows_installer.py
@@ -5,7 +5,6 @@ import argparse  # Command line arguments parsing and help.
 import subprocess
 
 import shutil
-import sys
 from datetime import datetime
 
 from pathlib import Path