Move some dependencies around. Switch to container builds.