New round of updates

Fran Garcia-Linaresrequested to merge
issue/gitlab_templates-3439644:3439644-new-round-of-updates into main

Closes #3439644

Merge request reports