diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh
index 1268557..b1df226 100644
--- a/builder-targets-cb.sh
+++ b/builder-targets-cb.sh
@@ -127,7 +127,8 @@ function create() {
     mv -v $INST_DIR/CLIENT_DATA/opsi-WinPKG.exe $INST_DIR/CLIENT_DATA/Install/
 
     # set exec bit on executeables
-    find $INST_DIR/CLIENT_DATA -type f -iname "*.exe" -o -iname "*.bat" -o -iname "*.cmd" -o -iname "*.msi" -o -iname "*.msp" | xargs chmod +x -v
+    find $INST_DIR/CLIENT_DATA/Install/ -type f -print0 | xargs -0 chmod +x
+    find $INST_DIR/CLIENT_DATA/UnInstall/ -type f -print0 | xargs -0 chmod +x
     find $INST_DIR/CLIENT_DATA -type d -print0 | xargs -0 chmod 755 -v 
 
     # delete the temp directory