Update to latest best pratices and restart on update