New config for entrain and some deploy changes