diff --git a/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml b/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml
index 0e53566beb4..06611f1f916 100644
--- a/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml
+++ b/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml
@@ -112,23 +112,20 @@
     - !reference [.valve-turnip-manual-rules, rules]
     - !reference [.zink-common-manual-rules, rules]
 
-.zink-radv-rules:
+.zink-radv-valve-rules:
   stage: layered-backends
   rules:
     - !reference [.test, rules]
     - !reference [.radv-valve-rules, rules]
     - !reference [.zink-common-rules, rules]
 
-.zink-radv-manual-rules:
+.zink-radv-valve-manual-rules:
   stage: layered-backends-nightly
   extends: .no-auto-retry
   rules:
     - !reference [.test, rules]
     - !reference [.radv-valve-manual-rules, rules]
     - !reference [.zink-common-manual-rules, rules]
-    - changes:
-        - .gitlab-ci/container/build-piglit.sh
-      when: manual
 
 .zink-test:
   timeout: 30m
diff --git a/src/gallium/drivers/zink/ci/gitlab-ci.yml b/src/gallium/drivers/zink/ci/gitlab-ci.yml
index 4e66172ea16..419f8f0878f 100644
--- a/src/gallium/drivers/zink/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/zink/ci/gitlab-ci.yml
@@ -211,7 +211,7 @@ zink-radv-polaris10-valve:
   extends:
     - .radv-zink-test-valve
     - .polaris10-test-valve-kws
-    - .zink-radv-manual-rules
+    - .zink-radv-valve-manual-rules
   timeout: 40m
   variables:
     GPU_VERSION: zink-radv-polaris10
@@ -222,7 +222,7 @@ zink-radv-navi10-valve:
   extends:
     - .radv-zink-test-valve
     - .navi10-test-valve-mupuf
-    - .zink-radv-manual-rules
+    - .zink-radv-valve-manual-rules
   timeout: 40m
   variables:
     CI_TRON_TIMEOUT__OVERALL__MINUTES: 30
@@ -234,7 +234,7 @@ zink-radv-vangogh-valve:
   extends:
     - .radv-zink-test-valve
     - .vangogh-test-valve
-    - .zink-radv-rules
+    - .zink-radv-valve-rules
   variables:
     GPU_VERSION: zink-radv-vangogh
     CI_TRON_PATTERN__SESSION_REBOOT__REGEX: 'BUG: kernel NULL pointer dereference, address'
@@ -252,7 +252,7 @@ zink-radv-navi31-valve:
   extends:
     - .radv-zink-test-valve
     - .navi31-test-valve
-    - .zink-radv-manual-rules
+    - .zink-radv-valve-manual-rules
   timeout: 1h 20m
   variables:
     GPU_VERSION: zink-radv-navi31