diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 11c26bf35253e9331f9cc9d2bcd86797e8ded8a5..1a4448046e775c2f2a9c69ae43cf5760599e6997 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -426,7 +426,7 @@ codec-smoke-test:
     - if cat smoke_test_output_hrtf.txt | grep -c "failed"; then echo "Smoke test with external hrtf files failed"; ret_val=1; fi
     - exit $ret_val
   artifacts:
-    name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results"
+    name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--job-$CI_JOB_NAME--results"
     expire_in: 1 week
     when: always
     paths:
@@ -508,7 +508,7 @@ pytest-compare-20ms-and-5ms-rendering:
     - if [ $exit_code10 -ne 0 ]; then echo "Non-bitexact cases encountered with 10ms rendering!"; exit_code=1; fi
     - if [ $exit_code -ne 0 ]; then exit $EXIT_CODE_FAIL; fi
   artifacts:
-    name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results"
+    name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--job-$CI_JOB_NAME--results"
     expire_in: 1 week
     when: always
     expose_as: "pytest 5ms and 10ms vs 20ms results"
@@ -813,7 +813,7 @@ ivas-pytest-on-merge-request:
     exit_codes:
       - 123
   artifacts:
-    name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results"
+    name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--job-$CI_JOB_NAME--results"
     expire_in: 1 week
     when: always
     paths:
@@ -864,7 +864,7 @@ ivas-interop-on-merge-request:
     exit_codes:
       - 123
   artifacts:
-    name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results"
+    name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--job-$CI_JOB_NAME--results"
     expire_in: 1 week
     when: always
     paths:
@@ -916,7 +916,7 @@ evs-pytest-on-merge-request:
     exit_codes:
       - 123
   artifacts:
-    name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results"
+    name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--job-$CI_JOB_NAME--results"
     expire_in: 1 week
     when: always
     paths:
@@ -1198,7 +1198,7 @@ codec-comparison-on-main-push:
     exit_codes:
       - 123
   artifacts:
-    name: "main-push--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results"
+    name: "main-push--sha-$CI_COMMIT_SHORT_SHA--job-$CI_JOB_NAME--results"
     expire_in: 1 week
     when: always
     paths: