diff --git a/src/gallium/drivers/zink/ci/gitlab-ci.yml b/src/gallium/drivers/zink/ci/gitlab-ci.yml
index 3f2489e17e9..19944edc094 100644
--- a/src/gallium/drivers/zink/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/zink/ci/gitlab-ci.yml
@@ -103,7 +103,7 @@ zink-anv-tgl-traces:
 
 zink-anv-tgl-traces-restricted:
   extends:
-    - zink-anv-tgl-traces
+    - .zink-anv-tgl-trace-test
     - .zink-anv-rules-restricted
   variables:
     PIGLIT_TRACES_FILE: traces-zink-restricted.yml
diff --git a/src/gallium/drivers/zink/ci/traces-zink-restricted.yml b/src/gallium/drivers/zink/ci/traces-zink-restricted.yml
index cbde37ea42d..7c2974be0e4 100644
--- a/src/gallium/drivers/zink/ci/traces-zink-restricted.yml
+++ b/src/gallium/drivers/zink/ci/traces-zink-restricted.yml
@@ -7,111 +7,130 @@ traces:
   AmnesiaTDD/Amnesia-f700-v2.trace:
     gl-zink-anv-tgl:
       checksum: c0a3a735ce4dcc394af8bef0289ba8b1
+
   Anna/Anna-f692-v2.trace:
     gl-zink-anv-tgl:
       label: [skip]
       text: "trace contains no swapbuffers, so no frames recorded"
+
   Antichamber/antichamber-f240-v2.trace:
     gl-zink-anv-tgl:
       checksum: 55e105b22656add7d16efac2bcad82f5
       text: "line widths look wrong compared to freedreno"
+
   Cradle/cradle-f3000-v2.trace:
     gl-zink-anv-tgl:
       label: [skip, slow]
+
   ICEDarkness/ICEDarkness-f230-v2.trace:
     gl-zink-anv-tgl:
-      label: [skip, flakes]
-      checksum: 64ac14b2a04d510e470fb2e06b039b42
-      text: "note that this trace is stable on freedreno"
+      checksum: 80d537de1a02572b02302670d84ae918
+
   LifelessPlanet/LifelessPlanet-f420-v2.trace:
     gl-zink-anv-tgl:
       checksum: defec084a01f13e5cf01147bcfd235e6
+
   MetroLLRedux/metro-ll-redux-kf480-v2.trace:
     gl-zink-anv-tgl:
       label: [skip, slow]
+
   OilRush/OilRush-f14000-v2.trace:
     gl-zink-anv-tgl:
       label: [skip]
       text: "requires allow_glsl_extension_directive_midshader"
+
   Osmos/Osmos-f2660-v2.trace:
     gl-zink-anv-tgl:
       checksum: 825c5c78096ec8095976c8c3d5b943b3
+
   PenumbraOverture/penumbra-ov-s0-2-864-f1500-v2.trace:
     gl-zink-anv-tgl:
       label: [skip, broken]
       checksum: fff50b2eb306641d90b4249542d437d1
       text: https://gitlab.freedesktop.org/mesa/mesa/-/issues/12465#note_2745831
+
   ShadowWarrior/ShadowWarrior-f3952-v2.trace:
     gl-zink-anv-tgl:
       label: [skip, flakes]
       checksum: 826f966a52bc956644bf41562aa9c686
       text: |-
         This trace is flaky on freedreno too.
+
   SirYouAreBeingHunted/sir-f750-v2.trace:
     gl-zink-anv-tgl:
       checksum: 68611fd9f51e5ef5d2eb4417031a379f
+
   SpecOps/specops-s0-1088-f1300-v2.trace:
     gl-zink-anv-tgl:
       label: [skip, broken, flakes]
       checksum: e4037172a61efe23a67b5cc9ea9960bb
-      text: https://gitlab.freedesktop.org/mesa/mesa/-/issues/8986
+      text: Rendered image is clearly wrong and flaky
+
   Superhot/superhot-f8100-v2.trace:
     gl-zink-anv-tgl:
-      label: [skip, broken, flakes]
-      checksum: 3f4ce060d0306b639565f8705abdea26
-      text: https://gitlab.freedesktop.org/mesa/mesa/-/issues/8986
+      checksum: 69e6cd6fbcb7d2c7166be49a936f2f88
+
   TheRavenRemastered/Raven-f10900-v2.trace:
     gl-zink-anv-tgl:
-      checksum: 64243ccd048cbbfc0649e8f3c5b5cdb3
       label: [skip, broken]
+      checksum: 64243ccd048cbbfc0649e8f3c5b5cdb3
       text: |
         MESA: error: zink: DEVICE LOST!
         Raven: ../src/gallium/drivers/zink/zink_context.c:4126: zink_wait_on_batch: Assertion `batch_id' failed.
         apitrace: warning: caught signal 6
         457165: error: caught an unhandled exception
+
   TombRaider2013/TombRaider-f1430-v2.trace:
     gl-zink-anv-tgl:
       label: [crash]
       text: |-
         ../src/intel/isl/isl_storage_image.c:196: isl_lower_storage_image_format: Assertion `!Unknown image format' failed.
         where the format is ISL_FORMAT_B8G8R8A8_UNORM.
+
   Witcher2/witcher2-s0-1970-f2038-v2.trace:
     gl-zink-anv-tgl:
       label: [skip]
       text: "many errors like 'GL_INVALID_VALUE in glBindBufferRange(offset misaligned 144/32)'"
+
   alien-isolation/AlienIsolation.bin.1-trim--k-f2000-v20201203-v2.trace:
     gl-zink-anv-tgl:
       label: [skip, slow]
       text: "Slow, just seems to display a bit of text and no gameplay, anyway (radeonsi or iris)"
+
   civilization-v/CivilizationV-trim--s705-761-f762-v20201203-v2.trace:
     gl-zink-anv-tgl:
       label: [skip, broken, flakes]
       checksum: 82e6d93321ab146d758f2d60a48f265d
       text: https://gitlab.freedesktop.org/mesa/mesa/-/issues/8986
+
   golf-with-your-friends/GolfWithYourFriends-trim--f1070-v20201203-v2.trace:
     gl-zink-anv-tgl:
       label: [skip, flakes]
       checksum: cd01820de77063f0397f26d6cd747d1c
       text: "has caused ../src/gallium/drivers/zink/zink_context.c:3773: zink_wait_on_batch: Assertion `batch_id' failed."
+
   hollow-knight/HollowKnight-trim--f2020-v20201203-v2.trace:
     gl-zink-anv-tgl:
-      label: [skip, flakes]
-      checksum: 78f9122c5dcd89826efe421fa626971c
-      text: "note that this trace is stable on freedreno"
+      checksum: c794fb3bec5a9421b53e0779acdb6e30
+
   ksp/KSP-trim--f4800-v20201203-v2.trace:
     gl-zink-anv-tgl:
       checksum: 28b08ee598387fdc58b6e0e92261e1d3
+
   overcooked2/Overcooked2-trim--f3301-v20201203-v2.trace:
     gl-zink-anv-tgl:
       checksum: 2d342febd76eb2b33e0496e5ed57e124
+
   plague-inc-evolved/PlagueIncEvolved-trim--f1200-v20201203-v2.trace:
     gl-zink-anv-tgl:
       label: [skip]
       text: "renders black in CI, freedreno CI has unspecified trouble with it too"
+
   slime-rancher/SlimeRancher-trim--f970-v20201203-v2.trace:
     gl-zink-anv-tgl:
       label: [skip]
       text: "renders black in CI, freedreno CI has unspecified trouble with it too"
+
   stellaris/Stellaris-trim--f722-v20201203-v2.trace:
     gl-zink-anv-tgl:
       label: [skip, flakes]
diff --git a/src/gallium/drivers/zink/ci/traces-zink.yml b/src/gallium/drivers/zink/ci/traces-zink.yml
index 4065a0ffd3d..12608b7749d 100644
--- a/src/gallium/drivers/zink/ci/traces-zink.yml
+++ b/src/gallium/drivers/zink/ci/traces-zink.yml
@@ -6,139 +6,171 @@ traces-db:
 traces:
   0ad/0ad-v2.trace:
     gl-zink-anv-tgl:
-      label: [skip, broken, flakes]
-      checksum: 1da0ecf4034a81aa16e7984b75368aec
-      text: https://gitlab.freedesktop.org/mesa/mesa/-/issues/8986
+      checksum: 90483dd55b41141664c2fcf6fa055500
+
   behdad-glyphy/glyphy-v2.trace:
     gl-zink-anv-tgl:
       checksum: b743608724c13bc4105e95385fc2b810
+
   blender/blender-demo-cube_diorama.trace:
     gl-zink-anv-tgl:
-      label: [skip, flakes, broken]
-      checksum: 7b3ebdb5a4a8282ff564a4f14e7791a4
-      text: https://gitlab.freedesktop.org/mesa/mesa/-/issues/8986
+      checksum: 5bfd510c1298c71ccd3c24c0662b857e
+
   blender/blender-demo-ellie_pose.trace:
     gl-zink-anv-tgl:
-      label: [skip, broken, flakes]
-      checksum: 9b5090a236350f04cb2a61c5f0c0fe0f
-      text: https://gitlab.freedesktop.org/mesa/mesa/-/issues/8986
+      checksum: a9fbbb4424c72c5b011a441c23cce29b
+
   glxgears/glxgears-2-v2.trace:
     gl-zink-anv-tgl:
       checksum: f53ac20e17da91c0359c31f2fa3f401e
+
   gputest/furmark-v2.trace:
     gl-zink-anv-tgl:
       checksum: 30649dc37efcf5dadc7b761769de51d7
+
   gputest/triangle-v2.trace:
     gl-zink-anv-tgl:
       checksum: 5f694874b15bcd7a3689b387c143590b
+
   godot/Material Testers.x86_64_2020.04.08_13.38_frame799.rdc:
     gl-zink-anv-tgl:
       label: [skip]
       checksum: dbe1de4e2e812413f173ea6c423117ff
       text: "'egl_platform.cpp( 227) - Error   - Couldn't find a suitable EGL config' -- revisit when we can turn on X11?"
+
   gputest/pixmark-julia-fp32-v2.trace:
     gl-zink-anv-tgl:
       checksum: fbf5e44a6f46684b84e5bb5ad6d36c67
+
   gputest/pixmark-julia-fp64-v2.trace:
     gl-zink-anv-tgl:
       checksum: 1760aea00af985b8cd902128235b08f6
+
   gputest/pixmark-volplosion-v2.trace:
     gl-zink-anv-tgl:
       checksum: 7e49248ad9dc4c052c04b11246c4bd33
       text: Different rendering from iris, but still looks correct (common result with this trace)
+
   gputest/plot3d-v2.trace:
     gl-zink-anv-tgl:
       checksum: 56f11d133f72712a6df13855ec00cdb0
+
   gputest/tessmark-v2.trace:
     gl-zink-anv-tgl:
       checksum: 04a5a9b7cbc88d8a66c33b5f1c08294d
+
   humus/AmbientAperture-v2.trace:
     gl-zink-anv-tgl:
       checksum: 0f3b7351a84e1e6f15430f8766af4b4c
+
   humus/Portals-v2.trace:
     gl-zink-anv-tgl:
       checksum: a37699d09e61a842fc909f0c4fb72cf1
+
   humus/CelShading-v2.trace:
     gl-zink-anv-tgl:
       checksum: 68f20f660b9d812083066342398fe1b0
+
   humus/DynamicBranching3-v2.trace:
     gl-zink-anv-tgl:
       checksum: 0eb6c37cb88b48513e217012edf1ad32
+
   humus/HDR-v2.trace:
     gl-zink-anv-tgl:
       checksum: b09d83a5887b19ceaaaf0ac69c6a0af4
+
   humus/RaytracedShadows-v2.trace:
     gl-zink-anv-tgl:
       checksum: 8c053a06021678e28bfffd68705c6293
+
   humus/VolumetricFogging2-v2.trace:
     gl-zink-anv-tgl:
       checksum: 354a0046d81981a5227691fd8401d8ef
+
   neverball/neverball-v2.trace:
     gl-zink-anv-tgl:
       checksum: 476a3e154a2564c9b136705cfdcf36de
+
   paraview/pv-manyspheres-v2.trace:
     gl-zink-anv-tgl:
       checksum: 190153b6437f7063a6853ca94e5914f2
+
   paraview/pv-waveletcontour-v2.trace:
     gl-zink-anv-tgl:
       checksum: be4aba8a24e2bd2beb068d0c9c89dfcb
+
   paraview/pv-waveletvolume-v2.trace:
     gl-zink-anv-tgl:
       checksum: b36c25e52624cbf8dab73b6acecb8e84
+
   pathfinder/demo-v2.trace:
     gl-zink-anv-tgl:
       checksum: 558c3d2b1b7acc782b3908c579ce0ce8
+
   pathfinder/canvas_moire-v2.trace:
     gl-zink-anv-tgl:
       checksum: 1706229fca06c1d7946ebc94e3b0a66d
+
   pathfinder/canvas_text_v2-v2.trace:
     gl-zink-anv-tgl:
       checksum: c824fcadd028eba50d9911ebe1a3f823
+
   ror/ror-default.trace:
     gl-zink-anv-tgl:
       checksum: d7b07cb1f6fdc6949bdaf84d2173e24b
+
   supertuxkart/supertuxkart-antediluvian-abyss.rdc:
     gl-zink-anv-tgl:
       label: [skip]
       checksum: 0af2faa0d9183c1bc4dc7612befe1f0a
       text: "'egl_platform.cpp( 227) - Error   - Couldn't find a suitable EGL config' -- revisit when we can turn on X11?"
+
   supertuxkart/supertuxkart-menu.rdc:
     gl-zink-anv-tgl:
       label: [skip]
       checksum: 0a4095dc7b441643a3336975b61c9e6a
       text: "'egl_platform.cpp( 227) - Error   - Couldn't find a suitable EGL config' -- revisit when we can turn on X11?"
+
   supertuxkart/supertuxkart-ravenbridge-mansion.rdc:
     gl-zink-anv-tgl:
       label: [skip]
       checksum: ca0b64f1a62e01765146be8391eae636
       text: "'egl_platform.cpp( 227) - Error   - Couldn't find a suitable EGL config' -- revisit when we can turn on X11?"
+
   unvanquished/unvanquished-lowest.trace:
     gl-zink-anv-tgl:
       checksum: 7789205e8b4d160dc81e3684f0627a38
+
   unvanquished/unvanquished-ultra.trace:
     gl-zink-anv-tgl:
       checksum: 026dde18e934e7ce3e36eb13ea8e975c
+
   valve/counterstrike-v2.trace:
     gl-zink-anv-tgl:
       label: [skip, flakes]
       checksum: 148ec1105f5f14c90cb756a178cef264
       text: "note that this trace is stable on freedreno"
+
   valve/counterstrike-source-v2.trace:
     gl-zink-anv-tgl:
       label: [skip, flakes]
       checksum: d5eb7d064ca31cb316e853a082a3950d
       text: occasional segfaults
+
   valve/half-life-2-v2.trace:
     gl-zink-anv-tgl:
       checksum: 8deac48993e4515589a7165e8bd14f25
+
   valve/portal-2-v2.trace:
     gl-zink-anv-tgl:
       checksum: 3683fd5bb2224d6f4a1c47c1eab277d9
+
   warzone2100/warzone2100-default.trace:
     gl-zink-anv-tgl:
       label: [skip, flakes]
       checksum: 56f1f06bdca3d5352b5e6c0c3d572f43
       text: occasional checksum change
+
   xonotic/xonotic-keybench-high-v2.trace:
     gl-zink-anv-tgl:
       checksum: 659ef8c91d9eeccd0dc603b196c2577c