Env file revamp