diff --git a/scripts/mkimage.sh b/scripts/mkimage.sh
index e4f177801a075d243fc72937628ca07a17a725f2..619d31a90bea12d38f4a635cd4f1301714823cb6 100755
--- a/scripts/mkimage.sh
+++ b/scripts/mkimage.sh
@@ -272,8 +272,7 @@ fi
 # setup defaults
 if [ -z "$WORKDIR" ]; then
 	WORKDIR="$(mktemp -d -t mkimage.XXXXXX)"
-	trap 'rm -rf $WORKDIR' INT
-	mkdir -p "$WORKDIR"
+	trap 'rm -rf $WORKDIR' INT EXIT
 fi
 req_profiles=${req_profiles:-${all_profiles}}
 req_arch=${req_arch:-${default_arch}}