Moved more configuration out of the chroot environment