Prepare for deployment @ 8D