diff --git a/CLIENT_DATA/delsub32.ins b/CLIENT_DATA/delsub32.ins
index 3c0b386..e4f84a6 100644
--- a/CLIENT_DATA/delsub32.ins
+++ b/CLIENT_DATA/delsub32.ins
@@ -39,10 +39,10 @@ comment "Delete program shortcuts"
 LinkFolder_uninstall
 
 [Winbatch_uninstall_old]
-"$UninstallProgramOld$" /S
+"$UninstallProgramOld$" /silent /norestart /SUPPRESSMSGBOXES /nocancel
 
 [Winbatch_uninstall]
-"$UninstallProgram$" /S
+"$UninstallProgram$" /silent /norestart /SUPPRESSMSGBOXES /nocancel
 
 [Files_uninstall]
 ; Example for recursively deleting the installation directory:
diff --git a/CLIENT_DATA/setup32.ins b/CLIENT_DATA/setup32.ins
index 6c72513..62f1628 100644
--- a/CLIENT_DATA/setup32.ins
+++ b/CLIENT_DATA/setup32.ins
@@ -76,7 +76,7 @@ else
 endif
 
 [Winbatch_install]
-"$InstallExe$" /S /D=$InstallDir$
+"$InstallExe$" /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP- /Dir=$InstallDir$
 
 [Files_install]
 ; copy the ini file to the InstallDir
diff --git a/builder-product.cfg b/builder-product.cfg
index 35fa7e0..d565ffc 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -28,5 +28,5 @@ ICON_DL_INDEX=0
 
 OPSI_INI_SECTION[0]="X86"
 OPSI_INI_OPTION[0]="UninstallProg"
-OPSI_INI_VALUE[0]="uninstall.exe"
+OPSI_INI_VALUE[0]="Uninstall\uninst000.exe"