modify image build with better abstraction for image names