Merge branch '2021-10-08-image-cleanups'

- A large number of image file and tooling related cleanups