Match upgrade schema to actual