Reorder config steps