Merge branch 'ds-workaround' into 'main'

fix: workaround for the outdated ds template

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