diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b0f53bf4645..88b9d2d414f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -388,7 +388,7 @@ include:
 
 .ci-deqp-artifacts:
   artifacts:
-    name: "${CI_PROJECT_NAME}_${CI_JOB_NAME}"
+    name: "${CI_PROJECT_NAME}_${CI_JOB_NAME_SLUG}"
     when: always
     untracked: false
     paths:
diff --git a/.gitlab-ci/build/gitlab-ci.yml b/.gitlab-ci/build/gitlab-ci.yml
index 8996e37c0a1..6651e95be2c 100644
--- a/.gitlab-ci/build/gitlab-ci.yml
+++ b/.gitlab-ci/build/gitlab-ci.yml
@@ -18,7 +18,7 @@
   # We don't want to download any previous job's artifacts
   dependencies: []
   artifacts:
-    name: "${CI_PROJECT_NAME}_${CI_JOB_NAME}"
+    name: "${CI_PROJECT_NAME}_${CI_JOB_NAME_SLUG}"
     when: always
     paths:
       - _build/meson-logs/*.txt
diff --git a/.gitlab-ci/lava/lava-gitlab-ci.yml b/.gitlab-ci/lava/lava-gitlab-ci.yml
index 91a49d7970d..b79da5f1360 100644
--- a/.gitlab-ci/lava/lava-gitlab-ci.yml
+++ b/.gitlab-ci/lava/lava-gitlab-ci.yml
@@ -45,7 +45,7 @@ variables:
   script:
     - /lava/lava-submit.sh
   artifacts:
-    name: "${CI_PROJECT_NAME}_${CI_JOB_NAME}"
+    name: "${CI_PROJECT_NAME}_${CI_JOB_NAME_SLUG}"
     when: always
     paths:
       - results/
diff --git a/.gitlab-ci/test/gitlab-ci.yml b/.gitlab-ci/test/gitlab-ci.yml
index 4e5896ed863..2076e2c385a 100644
--- a/.gitlab-ci/test/gitlab-ci.yml
+++ b/.gitlab-ci/test/gitlab-ci.yml
@@ -12,7 +12,7 @@
     - section_end ldd_section
   artifacts:
     when: always
-    name: "${CI_PROJECT_NAME}_${CI_JOB_NAME}"
+    name: "${CI_PROJECT_NAME}_${CI_JOB_NAME_SLUG}"
     paths:
       - results/
   rules:
@@ -217,7 +217,7 @@ yaml-toml-shell-py-test:
 .piglit-traces-test:
   artifacts:
     when: on_failure
-    name: "${CI_PROJECT_NAME}_${CI_JOB_NAME}"
+    name: "${CI_PROJECT_NAME}_${CI_JOB_NAME_SLUG}"
     reports:
       junit: results/junit.xml
     paths:
@@ -253,7 +253,7 @@ yaml-toml-shell-py-test:
     - ./install/fossilize-runner.sh
   artifacts:
     when: on_failure
-    name: "${CI_PROJECT_NAME}_${CI_JOB_NAME}"
+    name: "${CI_PROJECT_NAME}_${CI_JOB_NAME_SLUG}"
     paths:
       - results/
 
@@ -281,7 +281,7 @@ yaml-toml-shell-py-test:
     BM_ROOTFS: /rootfs-${DEBIAN_ARCH}
   artifacts:
     when: always
-    name: "${CI_PROJECT_NAME}_${CI_JOB_NAME}"
+    name: "${CI_PROJECT_NAME}_${CI_JOB_NAME_SLUG}"
     paths:
       - results/
       - serial*.txt
@@ -460,7 +460,7 @@ yaml-toml-shell-py-test:
   # test execution.
   artifacts:
     when: always
-    name: "${CI_PROJECT_NAME}_${CI_JOB_NAME}"
+    name: "${CI_PROJECT_NAME}_${CI_JOB_NAME_SLUG}"
     paths:
       - results
     reports:
diff --git a/src/gallium/drivers/d3d12/ci/gitlab-ci.yml b/src/gallium/drivers/d3d12/ci/gitlab-ci.yml
index e0edaeb5db8..c2bd7a810ea 100644
--- a/src/gallium/drivers/d3d12/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/d3d12/ci/gitlab-ci.yml
@@ -34,7 +34,7 @@
   timeout: 12m
   artifacts:
     when: on_failure
-    name: "${CI_PROJECT_NAME}_${CI_JOB_NAME}"
+    name: "${CI_PROJECT_NAME}_${CI_JOB_NAME_SLUG}"
     paths:
       - logs/
   variables:
diff --git a/src/microsoft/ci/gitlab-ci.yml b/src/microsoft/ci/gitlab-ci.yml
index 06ce9a9df32..0dc71dbf54e 100644
--- a/src/microsoft/ci/gitlab-ci.yml
+++ b/src/microsoft/ci/gitlab-ci.yml
@@ -20,7 +20,7 @@ test-spirv2dxil-windows:
     - . _install/spirv2dxil_run.ps1
   artifacts:
     when: on_failure
-    name: "${CI_PROJECT_NAME}_${CI_JOB_NAME}"
+    name: "${CI_PROJECT_NAME}_${CI_JOB_NAME_SLUG}"
     paths:
       - spirv2dxil_results.txt
 
@@ -46,7 +46,7 @@ test-dozen-deqp:
     - . _install/deqp_runner_run.ps1
   artifacts:
     when: on_failure
-    name: "${CI_PROJECT_NAME}_${CI_JOB_NAME}"
+    name: "${CI_PROJECT_NAME}_${CI_JOB_NAME_SLUG}"
     paths:
       - results/
     reports: