rework v5 migration for azure support