Merge "Remove image paths for Calico artifacts"