Closes https://gitlab.com/gitlab-com/infrastructure/issues/2725
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/34445