fix(updater): make clean-up job more robust / easier to debug

fix(updater): make clean-up job more robust / easier to debug #3909