Improved deploy and configs