Prepare for deployment v2