WIP - store provision_method and replace calls to capabilities to use the
provision_method for better reliability