Add gap to package setup, make root level setup exactly same as for any other container.