diff --git a/lib/builder-targets.sh b/lib/builder-targets.sh
index 53df44e..52af11e 100644
--- a/lib/builder-targets.sh
+++ b/lib/builder-targets.sh
@@ -252,6 +252,13 @@ builder_create() {
     }" $inst_file
   done
 
+  for inst_file in `find ${INST_DIR}/CLIENT_DATA -type f -name "*.opsiscript"` ; do
+    sed -i -e "/@@BUILDER_VARIABLES@@/ {
+                    r "$var_file"
+                    d
+    }" $inst_file
+  done
+
   # convert to dos file linefeed
   find $INST_DIR/CLIENT_DATA -type f | xargs -n1 -iREP sh -c 'file -i $0 | grep -v "utf-16" | grep "text/plain" && '$CMD_unix2dos' $0 ' REP >/dev/null