Backport 10871d71 to `16-5-stable`

What does this MR do and why?

This is a backport of MR !1588 (merged) to fix the 16-5-stable branch.

This is needed because currently any CNG pipeline in this repo or the CNG-mirror repo will not build for the 16-4-stable branch, meaning we are unable to deploy release-environments for this stable branch.

Part of gitlab-com/gl-infra/delivery#19825 (closed)

MR acceptance checklist

This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.

• This MR is backporting a bug fix, documentation update, or spec fix, previously merged in the default branch.
• The original MR has been deployed to GitLab.com (not applicable for documentation or spec changes).
• This MR has a severity label assigned (if applicable).

Note to the merge request author and maintainer

The process of backporting bug fixes into stable branches is tracked as part of an internal pilot. If you have questions about this process, please:

• Refer to the internal pilot issue for feedback or questions.
• Refer to the patch release runbook for engineers and maintainers for guidance.