Add --imagesdir to upload task
Fixed TARGET lists