diff --git a/src/amd/ci/gitlab-ci-inc.yml b/src/amd/ci/gitlab-ci-inc.yml
index a0b7523c5b0..b88412d3aa4 100644
--- a/src/amd/ci/gitlab-ci-inc.yml
+++ b/src/amd/ci/gitlab-ci-inc.yml
@@ -216,13 +216,6 @@
     GPU_VERSION: amd-raven
     VK_DRIVER: radeon
 
-.radv-traces:
-  extends:
-    - .lava-piglit-traces:x86_64
-  variables:
-    PIGLIT_PLATFORM: mixed_glx_egl  # TODO, take wine/VK in account
-    PIGLIT_TRACES_FILE: traces-amd.yml
-
 ############### Valve Infra
 .test-radv:
   variables:
diff --git a/src/amd/ci/gitlab-ci.yml b/src/amd/ci/gitlab-ci.yml
index 111658acd0c..f32c97b12a0 100644
--- a/src/amd/ci/gitlab-ci.yml
+++ b/src/amd/ci/gitlab-ci.yml
@@ -70,12 +70,14 @@ amd-raven-skqp:x86_64:
 
 radv-raven-traces:x86_64:
   extends:
-    - .radv-traces
+    - .lava-piglit-traces:x86_64
     - .radv-raven-test:x86_64
     - .lava-lenovo-TPad-C13-Yoga-zork:x86_64
   variables:
     HWCI_START_XORG: 1
+    PIGLIT_PLATFORM: mixed_glx_egl  # TODO, take wine/VK in account
     PIGLIT_REPLAY_DEVICE_NAME: "vk-${GPU_VERSION}"
+    PIGLIT_TRACES_FILE: traces-amd.yml
 
 radeonsi-raven-piglit-quick_gl:x86_64:
   extends: