Image names from 1.16 on include an architecture suffix, e.g. "-amd64"; the generic alias continues to work when pulling, but when loading from a tarball (i.e. running in CI) we must use the per-architecture name.
Also cleans some white spaces