Unify provisioning, solve the dependency
Merge pull request #1357 from mfalesni/prov-final-touches

Unify provisioning, solve the dependency