Feature/bootstrap

Fixing bootstrap in manifests