Fix wrong Order for Builds.

           PS1: First Try
           PS2: Making it default
           PS3: We should be able to update anyways
           PS4: Giving it some Love

Change-Id: I002d03d699197b8c16b964eadaab40a93c6925da