Trying to fix common-image build