Merge pull request #4717 from metalbear-co/meowchinist/cor-1528-update-ci-images