Fix for vanilla image deploy

Change-Id: I2a0eda67dbe9aabd87fa518f8255b06c4cbb902f