Fix host prov
Merge pull request #1387 from psav/provision_cleanup

[WIP] - Fix host prov