Edits to run ubuntu-setup in baseimage to reduce build time further