Refactor container and image matching in providers