diff --git a/CLIENT_DATA/cleanup3264.ins b/CLIENT_DATA/cleanup3264.ins
index 2520346..523a44e 100644
--- a/CLIENT_DATA/cleanup3264.ins
+++ b/CLIENT_DATA/cleanup3264.ins
@@ -113,9 +113,6 @@ if ($sereby_AdobeFlash$ = "reinstall")
     opsiservicecall_AdobeFlash_uninstall
     Set $reboot$ = "true"
 endif
-if ($sereby_java_reinstall$ = "true")
-    Dosbatch_java_reinstall
-endif
 
 ; and the final reboot after the uninstall is done
 if ($reboot$ = "true")
@@ -232,10 +229,6 @@ cscript /nologo "%ScriptPath%\UnInstall\Package\JRE\JavaUninstallScript.vbs" /ke
 "%opsiserviceUser%"
 ]
 
-[Dosbatch_java_reinstall]
-@echo off
-cscript /nologo "%ScriptPath%\UnInstall\Packages\JRE\JavaUninstallScript.vbs" /keeponly
-
 [Winbatch_AdobeShock_uninstall]
 
 [opsiservicecall_AdobeShock_uninstall]
diff --git a/CLIENT_DATA/define3264.inc b/CLIENT_DATA/define3264.inc
index aa16d20..89f1469 100644
--- a/CLIENT_DATA/define3264.inc
+++ b/CLIENT_DATA/define3264.inc
@@ -1,7 +1,5 @@
 DefVar  $MSVersion$
 Set     $MSVersion$ = GetMsVersionInfo
-DefVar  $sereby_java_reinstall$
-Set     $sereby_java_reinstall$ = GetProductProperty("sereby_java_reinstall", "true")
 DefVar	$sereby_timer_value$
 Set 	$sereby_timer_value$ = GetProductProperty("sereby_timer_value", "40")
 DefVar	$sereby_timer_enabled$
diff --git a/CLIENT_DATA/opsi-WinPKG.exe b/CLIENT_DATA/opsi-WinPKG.exe
new file mode 100644
index 0000000..1c1425c
Binary files /dev/null and b/CLIENT_DATA/opsi-WinPKG.exe differ
diff --git a/CLIENT_DATA/setup3264.ins b/CLIENT_DATA/setup3264.ins
index cd5f483..8db726f 100644
--- a/CLIENT_DATA/setup3264.ins
+++ b/CLIENT_DATA/setup3264.ins
@@ -144,7 +144,7 @@ dism /online /enable-feature /featurename:NetFx3 /All /Source:%ScriptPath%\Insta
 @echo off
 %ScriptDrive%
 cd "%ScriptPath%\Install"
-WinPKG.exe
+opsi-WinPKG.exe
 
 [Files_install_32]
 ; copy the ini file to the InstallDir
diff --git a/OPSI/control b/OPSI/control
index 4bc6f68..bb8adad 100644
--- a/OPSI/control
+++ b/OPSI/control
@@ -54,15 +54,6 @@ description: Timer enabled
 values: ["0", "1"]
 default: ["1"]
 
-[ProductProperty]
-type: unicode
-name: sereby_java_reinstall
-multivalue: False
-editable: False
-description: Remove all versions of Java and install the latest version (from sereby packet)
-values: ["false", "true"]
-default: ["true"]
-
 [ProductProperty]
 type: unicode
 name: sereby_dotnet1.1
diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh
index da78b4c..cbbce0c 100644
--- a/builder-targets-cb.sh
+++ b/builder-targets-cb.sh
@@ -85,7 +85,7 @@ function create() {
     
     # sed force update on flash
     sed -e "s!-install!-force -install!" -i $INST_DIR/CLIENT_DATA/Install/Packages/Flash/package.xml
-    
+
     # move the uninstallers in place (directory layout like the sereby package)
     mv -v $INST_DIR/CLIENT_DATA/X86/JavaRa $INST_DIR/CLIENT_DATA/UnInstall/Packages/JRE
     mv -v $INST_DIR/CLIENT_DATA/JavaUninstallScript.vbs $INST_DIR/CLIENT_DATA/UnInstall/Packages/JRE
@@ -93,6 +93,9 @@ function create() {
     mv -v $INST_DIR/CLIENT_DATA/X86/uninstall_flash_player.exe $INST_DIR/CLIENT_DATA/UnInstall/Packages/Flash
     mv -v $INST_DIR/CLIENT_DATA/X86/uninstall_shock_player.exe $INST_DIR/CLIENT_DATA/UnInstall/Packages/Shockwave
 
+    # move the opsi wrapper to the right dir (close the error window if nothing needs to be done)
+    mv -v $INST_DIR/CLIENT_DATA/opsi-WinPKG.exe $INST_DIR/CLIENT_DATA/Install/
+
     # delete the temp directory
     rm -rf $INST_DIR/CLIENT_DATA/X86
 }
\ No newline at end of file
diff --git a/opsi-WinPKG.au3 b/opsi-WinPKG.au3
new file mode 100644
index 0000000..a36cc0a
Binary files /dev/null and b/opsi-WinPKG.au3 differ