Merge branch 'improve-workspaces' into 'master'

Update workspaces for consistency

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/124857



Merged-by: Lorena Ciutacu <lciutacu@gitlab.com>
Approved-by: Lorena Ciutacu <lciutacu@gitlab.com>
Co-authored-by: Ashraf Khamis <akhamis@gitlab.com>