Necessary changes for deployment-ready env