Combine jobs back into a logical order
Some of these jobs need to be recombined. Ask Lorenzo and @leejr what docker images are actually desirable to keep. Then everything should exist inside of one of those smaller number of jobs.
One thing to watch out for is the time limit. It's currently 10h per job, but there are definitely combinations of jobs that could exceed that.