start re-work to handle UUIDs or tenant/imagename