Update overrides and --env