diff --git a/.gitlab-ci/container/create-rootfs.sh b/.gitlab-ci/container/create-rootfs.sh
index 484d373e345..a5eff319b34 100644
--- a/.gitlab-ci/container/create-rootfs.sh
+++ b/.gitlab-ci/container/create-rootfs.sh
@@ -105,6 +105,9 @@ apt-get -y install --no-install-recommends \
 # MinIO and doesn't depend on git
 pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates@34f4ade99434043f88e164933f570301fd18b125
 
+# Needed for manipulation with traces yaml files.
+pip3 install yq
+
 apt-get purge -y \
         $INSTALL_CI_FAIRY_PACKAGES
 
diff --git a/.gitlab-ci/container/debian/x86_test-base.sh b/.gitlab-ci/container/debian/x86_test-base.sh
index a92753ca4f5..24dd52ec900 100644
--- a/.gitlab-ci/container/debian/x86_test-base.sh
+++ b/.gitlab-ci/container/debian/x86_test-base.sh
@@ -114,6 +114,9 @@ mkdir -p /lava-files/
 # and doesn't depend on git
 pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates@34f4ade99434043f88e164933f570301fd18b125
 
+# Needed for manipulation with traces yaml files.
+pip3 install yq
+
 ############### Build libdrm
 
 . .gitlab-ci/container/build-libdrm.sh
diff --git a/.gitlab-ci/piglit/piglit-traces.sh b/.gitlab-ci/piglit/piglit-traces.sh
index d6cce71502e..997b88236a4 100755
--- a/.gitlab-ci/piglit/piglit-traces.sh
+++ b/.gitlab-ci/piglit/piglit-traces.sh
@@ -8,6 +8,11 @@ MINIO_ARGS="--credentials=/tmp/.minio_credentials"
 RESULTS=$(realpath -s "$PWD"/results)
 mkdir -p "$RESULTS"
 
+if [ "$PIGLIT_REPLAY_SUBCOMMAND" = "profile" ]; then
+    yq -i -Y '. | del(.traces[][] | select(.label[0,1,2,3,4,5,6,7,8,9] == "no-perf"))' \
+      "$PIGLIT_REPLAY_DESCRIPTION_FILE"  # label positions are a bit hack
+fi
+
 # WINE
 PATH="/opt/wine-stable/bin/:$PATH" # WineHQ path
 export WINEPREFIX="/dxvk-wine64" # hardcode DXVK for now
@@ -186,7 +191,7 @@ __PREFIX="trace/$PIGLIT_REPLAY_DEVICE_NAME"
 __MINIO_PATH="$PIGLIT_REPLAY_ARTIFACTS_BASE_URL"
 __MINIO_TRACES_PREFIX="traces"
 
-if [ "x$PIGLIT_REPLAY_SUBCOMMAND" != "xprofile" ]; then
+if [ "$PIGLIT_REPLAY_SUBCOMMAND" != "profile" ]; then
     quiet replay_minio_upload_images
 fi
 
diff --git a/src/gallium/drivers/virgl/ci/traces-virgl-iris.yml b/src/gallium/drivers/virgl/ci/traces-virgl-iris.yml
index 5479772bafc..4cd5a9d6808 100644
--- a/src/gallium/drivers/virgl/ci/traces-virgl-iris.yml
+++ b/src/gallium/drivers/virgl/ci/traces-virgl-iris.yml
@@ -225,7 +225,7 @@ traces:
         Assertion `attrib->_EffRelativeOffset < binding->Stride' failed.
   nheko/nheko-colors.trace:
     gl-virgl:
-      label: [skip, no-perf]
+      label: [no-perf]
       checksum: 9877fc41ce761c9ce15561b12ef77c27
   warzone2100/warzone2100-default.trace:
     gl-virgl:
diff --git a/src/gallium/drivers/virgl/ci/traces-virgl.yml b/src/gallium/drivers/virgl/ci/traces-virgl.yml
index 035ef826888..8f288d59812 100644
--- a/src/gallium/drivers/virgl/ci/traces-virgl.yml
+++ b/src/gallium/drivers/virgl/ci/traces-virgl.yml
@@ -219,7 +219,7 @@ traces:
         Assertion `attrib->_EffRelativeOffset < binding->Stride' failed.
   nheko/nheko-colors.trace:
     gl-virgl:
-      label: [skip, no-perf]
+      label: [no-perf]
       checksum: 3a12c08087e16cfae4729f4e9d6c9387
   warzone2100/warzone2100-default.trace:
     gl-virgl:
diff --git a/src/intel/ci/traces-iris.yml b/src/intel/ci/traces-iris.yml
index 2e2a64e37cf..2b9af857ea8 100644
--- a/src/intel/ci/traces-iris.yml
+++ b/src/intel/ci/traces-iris.yml
@@ -900,23 +900,23 @@ traces:
       checksum: 3d419f45bc5ce210a7df583e92143089
   blender/blender-demo-cube_diorama.trace:
     gl-intel-apl:
-      label: [skip, no-perf]
+      label: [no-perf]
       checksum: 6a0e17d98eca33e80810b6158e998aa1
       text: causes intermittent timeouts
     gl-intel-glx:
-      label: [skip, no-perf]
+      label: [no-perf]
       checksum: 6a0e17d98eca33e80810b6158e998aa1
     gl-intel-amly:
-      label: [skip, no-perf]
+      label: [no-perf]
       checksum: 6a0e17d98eca33e80810b6158e998aa1
     gl-intel-kbl:
-      label: [skip, no-perf]
+      label: [no-perf]
       checksum: 6a0e17d98eca33e80810b6158e998aa1
     gl-intel-whl:
-      label: [skip, no-perf]
+      label: [no-perf]
       checksum: 6a0e17d98eca33e80810b6158e998aa1
     gl-intel-cml:
-      label: [skip, no-perf]
+      label: [no-perf]
       checksum: 6a0e17d98eca33e80810b6158e998aa1
   blender/blender-demo-ellie_pose.trace:
     gl-intel-apl: