Tweaked build VM setup