[WIP] - Fix host prov

This is WIP so as not to be run on PRTester