[WIP] Workaround for new config layout.
Add --upgrade flag to entrypoint.
Finish handling new config layout.