diff --git a/.gitlab-ci/lava/lava-submit.sh b/.gitlab-ci/lava/lava-submit.sh
index f09fb2d2f07..5b4e698f710 100755
--- a/.gitlab-ci/lava/lava-submit.sh
+++ b/.gitlab-ci/lava/lava-submit.sh
@@ -17,6 +17,7 @@ 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
+cp artifacts/ci-common/capture-devcoredump.sh results/job-rootfs-overlay/
 artifacts/ci-common/generate-env.sh > results/job-rootfs-overlay/set-job-env-vars.sh
 
 tar zcf job-rootfs-overlay.tar.gz -C results/job-rootfs-overlay/ .
diff --git a/.gitlab-ci/lava/lava.yml.jinja2 b/.gitlab-ci/lava/lava.yml.jinja2
index 66a82a8cb8b..b83b2006287 100644
--- a/.gitlab-ci/lava/lava.yml.jinja2
+++ b/.gitlab-ci/lava/lava.yml.jinja2
@@ -102,6 +102,8 @@ actions:
           - GPU_AUTOSUSPEND=`find /sys/devices -name autosuspend_delay_ms | grep gpu | head -1`
           - echo -1 > $GPU_AUTOSUSPEND || true
 
+	  - ./capture-devcoredump.sh &
+
           - export CI_JOB_JWT="{{ jwt }}"
           # Store Mesa's disk cache under /tmp, rather than sending it out over NFS.
           - export XDG_CACHE_HOME=/tmp