[PR] Better deployment prep