Improving image build