diff --git a/build.sh b/build.sh
index 4883c71..d18eac0 100755
--- a/build.sh
+++ b/build.sh
@@ -19,6 +19,7 @@ export STAGE_WORK_DIR
 export ROOTFS_DIR
 
 export IMG_FILE
+export ZIP_FILE
 
 export QUILT_PATCHES
 export QUILT_NO_DIFF_INDEX=1
@@ -68,6 +69,7 @@ main() {
   ROOTFS_DIR="$STAGE_WORK_DIR/rootfs"
 
   IMG_FILE="${STAGE_WORK_DIR}/${IMG_DATE}-${IMG_NAME}.img"
+  ZIP_FILE="$DEPLOY_DIR/image_$IMG_DATE-${IMG_NAME}.zip"
 
   mkdir -p "$WORK_DIR"
 
diff --git a/stage0/18-finalise/01-run.sh b/stage0/18-finalise/01-run.sh
index 73d3def..e939fbe 100755
--- a/stage0/18-finalise/01-run.sh
+++ b/stage0/18-finalise/01-run.sh
@@ -50,9 +50,9 @@ unmount_image ${IMG_FILE}
 
 mkdir -p ${DEPLOY_DIR}
 
-rm -f ${DEPLOY_DIR}/image_${IMG_DATE}-${IMG_NAME}.zip
+rm -f "$ZIP_FILE"
 
-echo zip ${DEPLOY_DIR}/image_${IMG_DATE}-${IMG_NAME}.zip ${IMG_FILE}
+echo zip "$ZIP_FILE" ${IMG_FILE}
 pushd ${STAGE_WORK_DIR} > /dev/null
-zip ${DEPLOY_DIR}/image_${IMG_DATE}-${IMG_NAME}.zip $(basename ${IMG_FILE})
+zip "$ZIP_FILE" $(basename ${IMG_FILE})
 popd > /dev/null