fixing for majerti deployment env variables usage and mail policy