FABRIC-631 - Add 2 step deploy for all builds