Major refactor for rhel7 to match images, jobs, and tags.