Auto deploy improvments