Another stab at getting deployment right