diff --git a/opennebula-images/freebsd-build-opennebula-image.sh b/opennebula-images/freebsd-build-opennebula-image.sh
index 3d0add4..cb3dc82 100755
--- a/opennebula-images/freebsd-build-opennebula-image.sh
+++ b/opennebula-images/freebsd-build-opennebula-image.sh
@@ -39,7 +39,9 @@ cleanup() {
 	zpool export $ZPOOL_TMP ||:
 	mdconfig -du md0 ||:
 	mdconfig -du md1 ||:
-	rm -rf "$CLOUDSETUP_WORK"
+	rm -rf "$CLOUDSETUP_WORK" ||:
+	rmdir "$ZFSTARGET" ||:
+	rmdir "$UFSTARGET" ||:
 }
 trap cleanup EXIT