refactor manifests related to vagrant