[PATCH 2/5] Azure: Rework how we define what to build in the world build