Merge pull request #31504 from aroyoredhat/update-s2i-images-for-ocp-samples-sync