Merge branch 'ci/post-merge-ci-fixes' into 'main'

[CI] Post-merge CI updates to main

See merge request !1955