Fix services deployment order