This should speed up builds as more common
base images are built and also opens
up the possibility of using generics in the code.
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>