Merge branch 'pguinoiseau/revert-gitlab-scanners-ds-workaround' into 'main'

fix: revert "fix: workaround for the outdated ds template"

See merge request gitlab-com/gl-infra/common-ci-tasks!927