[PR] Refresh base provisioning, correct namespacing