Definitely add a LOT of swap even if it’s just to get you back up and running. The advantage of using swap here is builds are a temporary spike.
I use the two container setup and memory is even more under pressure during bootstrap as you also have two running containers. 