Refactors deployment strategy, again