Further prepping for cap deploy