diff --git a/dist/win/build.bat b/dist/win/build.bat
index 0c6e14cee..c97ebbb35 100644
--- a/dist/win/build.bat
+++ b/dist/win/build.bat
@@ -8,10 +8,12 @@ SET FIRST_COPYRIGHT_YEAR=2016
 SET ABOUT_URL="https://cryptomator.org"
 SET UPDATE_URL="https://cryptomator.org/downloads/"
 SET HELP_URL="https://cryptomator.org/contact/"
+SET MODULE_AND_MAIN_CLASS="org.cryptomator.desktop/org.cryptomator.launcher.Cryptomator"
 
 powershell -NoLogo -NoExit -ExecutionPolicy Unrestricted -Command .\build.ps1^
  -AppName %APPNAME%^
  -MainJarGlob "%MAIN_JAR_GLOB%"^
+ -ModuleAndMainClass "%MODULE_AND_MAIN_CLASS%"^
  -UpgradeUUID "%UPGRADE_UUID%"^
  -Vendor ""%VENDOR%""^
  -CopyrightStartYear %FIRST_COPYRIGHT_YEAR%^
diff --git a/dist/win/build.ps1 b/dist/win/build.ps1
index cfbd07244..78a5b5bb8 100644
--- a/dist/win/build.ps1
+++ b/dist/win/build.ps1
@@ -1,6 +1,7 @@
 Param(
 	[Parameter(Mandatory, HelpMessage="Please provide a name for the app")][string] $AppName,
 	[Parameter(Mandatory, HelpMessage="Please provide the glob pattern to identify the main jar")][string] $MainJarGlob,
+	[Parameter(Mandatory, HelpMessage="Please provide the module- and main class path to start the app")][string] $ModuleAndMainClass,
 	[Parameter(Mandatory, HelpMessage="Please provide the windows upgrade uuid for the installer")][string] $UpgradeUUID,
 	[Parameter(Mandatory, HelpMessage="Please provide the name of the vendor")][string] $Vendor,
 	[Parameter(Mandatory, HelpMessage="Please provide the starting year for the copyright notice")][int] $CopyrightStartYear,
@@ -68,7 +69,7 @@ if ($clean -and (Test-Path -Path $appPath)) {
 	--runtime-image runtime `
 	--input ../../target/libs `
 	--module-path ../../target/mods `
-	--module org.cryptomator.desktop/org.cryptomator.launcher.Cryptomator `
+	--module $ModuleAndMainClass `
 	--dest . `
 	--name $AppName `
 	--vendor $Vendor `
@@ -109,7 +110,7 @@ $Env:JP_WIXWIZARD_RESOURCES = "$buildDir\resources"
 & "$Env:JAVA_HOME\bin\jpackage" `
 	--verbose `
 	--type msi `
-	--win-upgrade-uuid  $UpgradeUUID `
+	--win-upgrade-uuid $UpgradeUUID `
 	--app-image $AppName `
 	--dest installer `
 	--name $AppName `