diff --git a/.gitlab-ci/test/gitlab-ci-inc.yml b/.gitlab-ci/test/gitlab-ci-inc.yml
index c41852201c5..38fd295ddcd 100644
--- a/.gitlab-ci/test/gitlab-ci-inc.yml
+++ b/.gitlab-ci/test/gitlab-ci-inc.yml
@@ -141,6 +141,7 @@
   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_RESULTS: "${GPU_VERSION}-replay"
     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 753fee8261e..7cea3da50b7 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_RESULTS: "broadcom-rpi4-replay"
 
 v3d-rpi4-gl:arm32:
   extends:
@@ -461,7 +460,6 @@ v3d-rpi5-traces:arm64:
   variables:
     HWCI_TEST_SCRIPT: "/install/piglit/piglit-traces.sh"
     PIGLIT_TRACES_FILE: traces-broadcom.yml
-    PIGLIT_RESULTS: "broadcom-rpi5-replay"
 
 v3dv-rpi5-vk:arm64:
   extends:
diff --git a/src/freedreno/ci/gitlab-ci.yml b/src/freedreno/ci/gitlab-ci.yml
index 19bbacbdf1a..f077537898d 100644
--- a/src/freedreno/ci/gitlab-ci.yml
+++ b/src/freedreno/ci/gitlab-ci.yml
@@ -53,8 +53,6 @@ a306-traces:
     - .a306-test
   rules:
     - when: never # Google nginx needs updating
-  variables:
-    PIGLIT_RESULTS: "freedreno-a306-replay"
 
 a530-gl:
   extends:
@@ -72,8 +70,6 @@ a530-traces:
     - .a530-test
   rules:
     - when: never # Google nginx needs updating
-  variables:
-    PIGLIT_RESULTS: "freedreno-a530-replay"
 
 a530-piglit:
   extends:
@@ -408,7 +404,6 @@ a630-traces:
   rules:
     - when: never  # Cheza DUTs are retired and no longer active
   variables:
-    PIGLIT_RESULTS: "freedreno-a630-replay"
     # This lets us run several more traces which don't use any features we're
     # missing.
     MESA_GLSL_VERSION_OVERRIDE: "460"
diff --git a/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml b/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml
index 5a12d811a50..0181e3d6acc 100644
--- a/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml
@@ -23,7 +23,6 @@ llvmpipe-traces:
     EGL_PLATFORM: "surfaceless"
     PIGLIT_TRACES_FILE: traces-llvmpipe.yml
     PIGLIT_REPLAY_DEVICE_NAME: "gl-vmware-llvmpipe"
-    PIGLIT_RESULTS: "llvmpipe-replay"
 
 llvmpipe:
   variables:
diff --git a/src/gallium/frontends/lavapipe/ci/gitlab-ci.yml b/src/gallium/frontends/lavapipe/ci/gitlab-ci.yml
index 527ec4e04f7..2809f3295e5 100644
--- a/src/gallium/frontends/lavapipe/ci/gitlab-ci.yml
+++ b/src/gallium/frontends/lavapipe/ci/gitlab-ci.yml
@@ -54,7 +54,6 @@ lavapipe-vkd3d:
   variables:
     PIGLIT_TRACES_FILE: traces-lavapipe.yml
     PIGLIT_REPLAY_DEVICE_NAME: "vk-lvp"
-    PIGLIT_RESULTS: "${GPU_VERSION}-replay"
   extends:
     - .piglit-traces-test
     - .lavapipe-test