Fix capedwarf image lifecycle