diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f5e19c3290e..a4c9130395a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1132,6 +1132,24 @@ virgl-traces:
     MESA_GLES_VERSION_OVERRIDE: "3.1"
     MESA_GLSL_VERSION_OVERRIDE: "310"
 
+arm64-a630-traces:
+  extends:
+    - .piglit-traces-test
+    - .arm64-a630-test
+  variables:
+    BARE_METAL_TEST_SCRIPT: "/install/piglit/run.sh"
+    EGL_PLATFORM: "surfaceless"
+    PIGLIT_REPLAY_DESCRIPTION_FILE: "/install/traces-freedreno.yml"
+    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.
+    MESA_GLSL_VERSION_OVERRIDE: "460"
+    MESA_GL_VERSION_OVERRIDE: "4.6"
+  artifacts:
+    reports:
+      junit: results/junit.xml
+
 radv-polaris10-traces:
   extends:
     - .piglit-traces-test
@@ -1339,24 +1357,6 @@ arm64_a630_gles3:
   variables:
     DEQP_VER: gles3
 
-arm64_a630_traces:
-  extends:
-    - .arm64-deqp-test
-    - .arm64-a630-test
-  variables:
-    BARE_METAL_TEST_SCRIPT: "/install/tracie-runner-gl.sh"
-    DEVICE_NAME: "freedreno-a630"
-    DRIVER_NAME: "freedreno"
-    TRACIE_NO_UNIT_TESTS: 1
-    TRACIE_UPLOAD_TO_MINIO: 1
-    # This lets us run several more traces which don't use any features we're
-    # missing.
-    MESA_GLSL_VERSION_OVERRIDE: "460"
-    MESA_GL_VERSION_OVERRIDE: "4.6"
-  artifacts:
-    reports:
-      junit: results/junit.xml
-
 arm64_a630_gl:
   extends:
     - .baremetal-deqp-test
diff --git a/.gitlab-ci/bare-metal/rootfs-setup.sh b/.gitlab-ci/bare-metal/rootfs-setup.sh
index d6a6d6f21fc..d5b54518983 100644
--- a/.gitlab-ci/bare-metal/rootfs-setup.sh
+++ b/.gitlab-ci/bare-metal/rootfs-setup.sh
@@ -42,6 +42,8 @@ for var in \
     DEQP_WIDTH \
     DEVICE_NAME \
     DRIVER_NAME \
+    EGL_PLATFORM \
+    FDO_UPSTREAM_REPO \
     FD_MESA_DEBUG \
     FLAKES_CHANNEL \
     GPU_VERSION \
@@ -61,8 +63,6 @@ for var in \
     PIGLIT_REPLAY_REFERENCE_IMAGES_BASE_URL \
     PIGLIT_REPLAY_UPLOAD_TO_MINIO \
     PIGLIT_RESULTS \
-    TRACIE_NO_UNIT_TESTS \
-    TRACIE_UPLOAD_TO_MINIO \
     TU_DEBUG \
     VK_DRIVER \
     ; do
diff --git a/.gitlab-ci/piglit/freedreno-a630-replay.txt b/.gitlab-ci/piglit/freedreno-a630-replay.txt
new file mode 100644
index 00000000000..3a08fab8c8b
--- /dev/null
+++ b/.gitlab-ci/piglit/freedreno-a630-replay.txt
@@ -0,0 +1,16 @@
+summary:
+       name:  results
+       ----  --------
+       pass:       53
+       fail:        0
+      crash:        0
+       skip:        0
+    timeout:        0
+       warn:        0
+ incomplete:        0
+ dmesg-warn:        0
+ dmesg-fail:        0
+    changes:        0
+      fixes:        0
+regressions:        0
+      total:       53