Rework scenario to allow running them across several images