diff --git a/lib/builder-targets.sh b/lib/builder-targets.sh
index 8fb3ad8..1d9b496 100644
--- a/lib/builder-targets.sh
+++ b/lib/builder-targets.sh
@@ -68,6 +68,10 @@ builder_prepare() {
     # setup work directory
     OUTPUT_DIR=$(mktemp -d $TMP_DIR/opsi-builder.XXXXXXXXXX) || { echo "Failed to create temp dir"; exit 1; }
 
+    # prepare
+    INST_DIR=$OUTPUT_DIR/$PN
+    mkdir $INST_DIR
+
 }
 
 
@@ -136,10 +140,6 @@ builder_retrieve() {
 ####################
 builder_create() {
 
-    # prepare
-    INST_DIR=$OUTPUT_DIR/$PN
-    mkdir $INST_DIR
-
     # Copy files and convert text files to dos format
     cp -Rv ${PRODUCT_DIR}/OPSI         $INST_DIR
     cp -Rv ${PRODUCT_DIR}/CLIENT_DATA  $INST_DIR