Environment config file update

Cherry pick of fb2ee3290e2a9a978e93efe043eee776a41ff893