Fix HVM image build

This fixes image building for HVM images