Moving where env vars are set