[jimmcslim]

Not sure if images on the registry also support the new labels functionality, but that might be a way to avoid to obvious image architecture (x86 vs ARM) issues.