Migrating to self contained vaults