Merge branch 'ci/fix-job-artifact-names' into 'main'

Change artifact names to always refer to job name instead of job stage

See merge request !2213