Closes https://gitlab.com/gitlab-org/build/CNG/-/issues/2109

Changelog: changed