Refactor build once push multi code path