Reduced Image Size by 500MB!

By combining steps into one, very large step, the resulting image size
is nearly 500MB less. This isn't including the steps that also take up
storage, many times this in total.

So, win!