diff --git a/.gitlab-ci/lava/lava-submit.sh b/.gitlab-ci/lava/lava-submit.sh
index d7de193e223..1cd14bec0b1 100755
--- a/.gitlab-ci/lava/lava-submit.sh
+++ b/.gitlab-ci/lava/lava-submit.sh
@@ -3,10 +3,6 @@
 set -e
 set -x
 
-rm -rf results
-mkdir -p results/job-rootfs-overlay/
-artifacts/ci-common/generate-env.sh > results/job-rootfs-overlay/environment.sh
-
 # Try to use the kernel and rootfs built in mainline first, so we're more
 # likely to hit cache
 if wget -q --method=HEAD "https://${BASE_SYSTEM_MAINLINE_HOST_PATH}/done"; then
@@ -15,6 +11,14 @@ else
 	BASE_SYSTEM_HOST_PATH="${BASE_SYSTEM_FORK_HOST_PATH}"
 fi
 
+rm -rf results
+mkdir -p results/job-rootfs-overlay/
+
+# LAVA always uploads to MinIO when necessary as we don't have direct upload
+# from the DUT
+export PIGLIT_REPLAY_UPLOAD_TO_MINIO=1
+artifacts/ci-common/generate-env.sh > results/job-rootfs-overlay/environment.sh
+
 tar zcf job-rootfs-overlay.tar.gz -C results/job-rootfs-overlay/ .
 ci-fairy minio login "${CI_JOB_JWT}"
 ci-fairy minio cp job-rootfs-overlay.tar.gz "minio://${JOB_ROOTFS_OVERLAY_PATH}"