Combine build steps into one RUN that leaves no waste behind