Bootstrap config refactor