[PR] Additional deployment preparedness