diff --git a/.gitlab-ci/test/gitlab-ci-inc.yml b/.gitlab-ci/test/gitlab-ci-inc.yml
index f0a76b5f6cb..c41852201c5 100644
--- a/.gitlab-ci/test/gitlab-ci-inc.yml
+++ b/.gitlab-ci/test/gitlab-ci-inc.yml
@@ -140,6 +140,7 @@
     - .test-piglit
   variables:
     PIGLIT_REPLAY_EXTRA_ARGS: --db-path ${CI_PROJECT_DIR}/replayer-db/ --minio_bucket=${S3_TRACIE_PUBLIC_BUCKET} --jwt-file=${S3_JWT_FILE}
+    PIGLIT_REPLAY_DEVICE_NAME: $GPU_VERSION
     PIGLIT_NO_WINDOW: 1
     HWCI_TEST_SCRIPT: "/install/piglit/piglit-traces.sh"
   script:
diff --git a/src/broadcom/ci/gitlab-ci.yml b/src/broadcom/ci/gitlab-ci.yml
index 38d43dc88d1..753fee8261e 100644
--- a/src/broadcom/ci/gitlab-ci.yml
+++ b/src/broadcom/ci/gitlab-ci.yml
@@ -199,7 +199,6 @@ v3d-rpi4-traces:arm64:
   variables:
     HWCI_TEST_SCRIPT: "/install/piglit/piglit-traces.sh"
     PIGLIT_TRACES_FILE: traces-broadcom.yml
-    PIGLIT_REPLAY_DEVICE_NAME: "broadcom-rpi4"
     PIGLIT_RESULTS: "broadcom-rpi4-replay"
 
 v3d-rpi4-gl:arm32:
@@ -462,7 +461,6 @@ v3d-rpi5-traces:arm64:
   variables:
     HWCI_TEST_SCRIPT: "/install/piglit/piglit-traces.sh"
     PIGLIT_TRACES_FILE: traces-broadcom.yml
-    PIGLIT_REPLAY_DEVICE_NAME: "broadcom-rpi5"
     PIGLIT_RESULTS: "broadcom-rpi5-replay"
 
 v3dv-rpi5-vk:arm64:
diff --git a/src/freedreno/ci/gitlab-ci.yml b/src/freedreno/ci/gitlab-ci.yml
index 4f5026f893d..19bbacbdf1a 100644
--- a/src/freedreno/ci/gitlab-ci.yml
+++ b/src/freedreno/ci/gitlab-ci.yml
@@ -54,7 +54,6 @@ a306-traces:
   rules:
     - when: never # Google nginx needs updating
   variables:
-    PIGLIT_REPLAY_DEVICE_NAME: "freedreno-a306"
     PIGLIT_RESULTS: "freedreno-a306-replay"
 
 a530-gl:
@@ -74,7 +73,6 @@ a530-traces:
   rules:
     - when: never # Google nginx needs updating
   variables:
-    PIGLIT_REPLAY_DEVICE_NAME: "freedreno-a530"
     PIGLIT_RESULTS: "freedreno-a530-replay"
 
 a530-piglit:
@@ -410,7 +408,6 @@ a630-traces:
   rules:
     - when: never  # Cheza DUTs are retired and no longer active
   variables:
-    PIGLIT_REPLAY_DEVICE_NAME: "freedreno-a630"
     PIGLIT_RESULTS: "freedreno-a630-replay"
     # This lets us run several more traces which don't use any features we're
     # missing.