Additional tweaks to deployment configs