SPICE / BAMBINO deployment refactor