Cleanup, do a multi-machine setup so i386 and amd64 can run at the same time