Merge branch 'fix-cleanup-mock-tags-in-16-4' into '16-4-stable'

Backport 16.4 : Clean mocked tags from assets

See merge request https://gitlab.com/gitlab-org/build/CNG/-/merge_requests/1691



Merged-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Approved-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Approved-by: Clemens Beck <cbeck@gitlab.com>
Co-authored-by: Hossein Pursultani <hpursultani@gitlab.com>