diff --git a/scripts/common b/scripts/common
index 74f9c4c..f18fd89 100644
--- a/scripts/common
+++ b/scripts/common
@@ -18,7 +18,7 @@ bootstrap(){
 	capsh --drop=cap_setfcap -- -c "${BOOTSTRAP_CMD} --components=main,contrib,non-free \
 		--arch armhf \
 		--keyring "${STAGE_DIR}/files/raspberrypi.gpg" \
-		$1 $2 $3"
+		$1 $2 $3" || rmdir "$2/debootstrap"
 }
 export -f bootstrap