Make sure to finish if --user-image-never-remove is enabled