diff --git a/.gitlab-ci/test-source-dep.yml b/.gitlab-ci/test-source-dep.yml
index ecc0a05ba0d..97eba5abcd8 100644
--- a/.gitlab-ci/test-source-dep.yml
+++ b/.gitlab-ci/test-source-dep.yml
@@ -14,6 +14,20 @@
     - if: *is-scheduled-pipeline
       when: never
 
+# Rule for restricted traces jobs to only run for users with access to those
+# traces (both https://gitlab.freedesktop.org/gfx-ci/tracie/traces-db-private
+# for trace access, and minio bucket access for viewing result images from CI).
+#
+# This is a compromise, allowing some marked developers to have their MRs
+# blocked on regressions to non-redistributable traces, while not blocking
+# merges for other devs who would be unable to debug changes to them.
+.restricted-rules:
+  rules:
+    # If the triggerer has access to the restricted traces and if it is pre-merge
+    - if: '($GITLAB_USER_LOGIN !~ "/^(robclark|anholt|flto|cwabbott0|Danil|tomeu|okias|gallo)$/") &&
+           ($GITLAB_USER_LOGIN != "marge-bot" || $CI_COMMIT_BRANCH)'
+      when: never
+
 # Mesa core source file dependencies that may impact any test job
 # ---------------------------------------------------------------
 .core-rules:
@@ -226,10 +240,7 @@
 .freedreno-rules-restricted:
   stage: freedreno
   rules:
-    # If the triggerer has access to the restricted traces and if it is pre-merge
-    - if: '($GITLAB_USER_LOGIN !~ "/^(robclark|anholt|flto|cwabbott0|Danil|tomeu|okias|gallo)$/") &&
-           ($GITLAB_USER_LOGIN != "marge-bot" || $CI_COMMIT_BRANCH)'
-      when: never
+    - !reference [.restricted-rules, rules]
     - !reference [.freedreno-rules, rules]
 
 # Rules for GL driver performance tracking.  We want them to run as code is
@@ -557,6 +568,13 @@
     - !reference [.anv-rules, rules]
     - !reference [.zink-common-rules, rules]
 
+.zink-anv-rules-restricted:
+  stage: layered-backends
+  rules:
+    - !reference [.restricted-rules, rules]
+    - !reference [.anv-rules, rules]
+    - !reference [.zink-common-rules, rules]
+
 .zink-turnip-rules:
   stage: layered-backends
   rules:
diff --git a/src/gallium/drivers/zink/ci/gitlab-ci.yml b/src/gallium/drivers/zink/ci/gitlab-ci.yml
index 481ab3af0be..abc8812ae5b 100644
--- a/src/gallium/drivers/zink/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/zink/ci/gitlab-ci.yml
@@ -40,17 +40,22 @@ zink-lvp:
   script:
     - xvfb-run --server-args='-noreset' sh -c "GALLIUM_DRIVER=zink VK_DRIVER=lvp install/deqp-runner.sh"
 
-zink-anv-tgl:
+.zink-anv-test:
   extends:
     - .anv-tgl-test
     - .zink-anv-rules
     - .zink-test
+  variables:
+    VK_DRIVER: intel
+    GPU_VERSION: zink-anv-tgl
+
+zink-anv-tgl:
+  extends:
+    - .zink-anv-test
   variables:
     DEQP_SUITE: zink-anv-tgl
     PIGLIT_NO_WINDOW: 1
-    VK_DRIVER: intel
     HWCI_START_XORG: 1
-    GPU_VERSION: zink-anv-tgl
 
 # Manual full run when you want to double-check the full status.
 zink-anv-tgl-full:
@@ -64,6 +69,28 @@ zink-anv-tgl-full:
   timeout: 1h 30m
   parallel: 3
 
+zink-anv-tgl-traces:
+  extends:
+    - .lava-piglit-traces:amd64
+    - .zink-anv-test
+    - .zink-trace-test
+    # Add .lava-traces-base again to override .zink-anv-test setting the
+    # HWCI_TEST_SCRIPT, but .lava-piglit-traces having to come first to get
+    # dependencies right.
+    - .lava-traces-base
+  variables:
+    MESA_LOADER_DRIVER_OVERRIDE: zink
+    PIGLIT_REPLAY_DESCRIPTION_FILE: "/install/traces-zink.yml"
+
+zink-anv-tgl-traces-restricted:
+  extends:
+    - zink-anv-tgl-traces
+    - .zink-anv-rules-restricted
+  variables:
+    PIGLIT_REPLAY_DESCRIPTION_FILE: "/install/traces-zink-restricted.yml"
+    PIGLIT_REPLAY_EXTRA_ARGS: --keep-image --db-path ${CI_PROJECT_DIR}/replayer-db/ --minio_bucket=mesa-tracie-private --jwt-file=${CI_JOB_JWT_FILE}
+  allow_failure: true
+
 zink-tu-a618:
   extends:
     - .a618-test
diff --git a/src/gallium/drivers/zink/ci/traces-zink-restricted.yml b/src/gallium/drivers/zink/ci/traces-zink-restricted.yml
new file mode 100644
index 00000000000..84a727be985
--- /dev/null
+++ b/src/gallium/drivers/zink/ci/traces-zink-restricted.yml
@@ -0,0 +1,109 @@
+%YAML 1.2
+---
+traces-db:
+  download-url: "http://caching-proxy/cache/?uri=https://s3.freedesktop.org/mesa-tracie-private/"
+
+traces:
+  AmnesiaTDD/Amnesia-f700-v2.trace:
+    gl-zink-anv-tgl:
+      checksum: 9cd992354bf22310199406ccd83ce458
+  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: 50664836118bb25c3a3bc91c10644233
+      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"
+  LifelessPlanet/LifelessPlanet-f420-v2.trace:
+    gl-zink-anv-tgl:
+      checksum: e7cace46dfa2fe588bf55f03f5a50e1f
+  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: 17daf7dc20dd74186d04eb54497a1690
+  PenumbraOverture/penumbra-ov-s0-2-864-f1500-v2.trace:
+    gl-zink-anv-tgl:
+      checksum: d2f77e1e8ae0c1a55d4c8c1652d88990
+      text: "broken rendering on zink+anv and zink+radv, fine on iris"
+  ShadowWarrior/ShadowWarrior-f3952-v2.trace:
+    gl-zink-anv-tgl:
+      label: [skip, flakes]
+      checksum: 826f966a52bc956644bf41562aa9c686
+      text: |-
+        'WARNING: Incorrect rendering will happen because the Vulkan device doesn't support the 'EXT_attachment_feedback_loop_layout' feature.'
+        This trace is flaky on freedreno too.
+  SirYouAreBeingHunted/sir-f750-v2.trace:
+    gl-zink-anv-tgl:
+      checksum: c40a5858c5d598b0845e64dd13862cd7
+  SpecOps/specops-s0-1088-f1300-v2.trace:
+    gl-zink-anv-tgl:
+      checksum: e4037172a61efe23a67b5cc9ea9960bb
+  Superhot/superhot-f8100-v2.trace:
+    gl-zink-anv-tgl:
+      checksum: 488ac7f0a747ed9f9255f60be7118650
+  TheRavenRemastered/Raven-f10900-v2.trace:
+    gl-zink-anv-tgl:
+      label: [crash]
+      checksum: 1dbb16cb6a61f166c0a8d0db6e88a63d
+      text: "https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20319"
+  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:
+      checksum: f02f72bb81e0aeeb28671314aff80e52
+  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"
+  ksp/KSP-trim--f4800-v20201203-v2.trace:
+    gl-zink-anv-tgl:
+      checksum: 4ff2057a3aeb911eef0cbe023ad3375a
+  overcooked2/Overcooked2-trim--f3301-v20201203-v2.trace:
+    gl-zink-anv-tgl:
+      checksum: 2c9b64b805a4e489c3e5201f16743d14
+  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]
+      checksum: 1c263695e5bdfcd622f26292a3b2a10e
+      text: "looks good but checksum keeps changing"
diff --git a/src/gallium/drivers/zink/ci/traces-zink.yml b/src/gallium/drivers/zink/ci/traces-zink.yml
new file mode 100644
index 00000000000..a11530e8c18
--- /dev/null
+++ b/src/gallium/drivers/zink/ci/traces-zink.yml
@@ -0,0 +1,150 @@
+%YAML 1.2
+---
+traces-db:
+  download-url: "http://caching-proxy/cache/?uri=https://s3.freedesktop.org/mesa-tracie-public/"
+
+traces:
+  0ad/0ad-v2.trace:
+    gl-zink-anv-tgl:
+      checksum: 1da0ecf4034a81aa16e7984b75368aec
+  behdad-glyphy/glyphy-v2.trace:
+    gl-zink-anv-tgl:
+      checksum: b743608724c13bc4105e95385fc2b810
+  blender/blender-demo-cube_diorama.trace:
+    gl-zink-anv-tgl:
+      label: [crash]
+      checksum: 6a0e17d98eca33e80810b6158e998aa1
+      text: "https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20319"
+  blender/blender-demo-ellie_pose.trace:
+    gl-zink-anv-tgl:
+      label: [crash]
+      checksum: f11aa01f5ef3a563567e2a85998c418e
+      text: "https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20319"
+  freedoom/freedoom-phase2-gl-high.trace:
+    gl-zink-anv-tgl:
+      checksum: fa674cb9aa2fd7f4d6329388478b5519
+  glxgears/glxgears-2-v2.trace:
+    gl-zink-anv-tgl:
+      checksum: f53ac20e17da91c0359c31f2fa3f401e
+  gputest/furmark-v2.trace:
+    gl-zink-anv-tgl:
+      checksum: 433b69bea68cfe81914b857bbdc60ea5
+  gputest/pixmark-piano-v2.trace:
+    gl-zink-anv-tgl:
+      checksum: 344e133c9faaeb24c6e0ec13d2f905b1
+  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: 186cbcd703a3483f2e639b986f6c2b15
+      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: c0e233fb1ebd511c076a5f2eede21fd0
+  humus/AmbientAperture-v2.trace:
+    gl-zink-anv-tgl:
+      checksum: 0bb0e9caf5820f4ead2391ed69791505
+  humus/Portals-v2.trace:
+    gl-zink-anv-tgl:
+      checksum: ae4dd23b6d3eac332d61cf3e28e968a4
+  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: 0f2d9664dc0983f87068a7e487b3824d
+  paraview/pv-manyspheres-v2.trace:
+    gl-zink-anv-tgl:
+      checksum: 190153b6437f7063a6853ca94e5914f2
+  paraview/pv-waveletcontour-v2.trace:
+    gl-zink-anv-tgl:
+      checksum: 3a733fc18bee55c4a4d97a44761ec6ed
+  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: 037eef0b288cc6e9e37bb2334edb7368
+  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: 7791755c957b55bfc5d30befe1e1f20d
+  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:
+      label: [crash]
+      checksum: c4ba4cdc96396b354b0040278b374b15
+      text: "https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20319"
+  valve/portal-2-v2.trace:
+    gl-zink-anv-tgl:
+      checksum: a10392dbca5b15cc76468a3a819b9d4d
+  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: 181424f3afd256108be63d8ea0669b6b