Switched to machine-specific tags for OA-cache and OA-conform repos