diff --git a/src/amd/ci/gitlab-ci-inc.yml b/src/amd/ci/gitlab-ci-inc.yml
index f6289929c17..bafde5aa68c 100644
--- a/src/amd/ci/gitlab-ci-inc.yml
+++ b/src/amd/ci/gitlab-ci-inc.yml
@@ -3,10 +3,7 @@
   rules:
     - !reference [.collabora-farm-rules, rules]
     - !reference [.gl-rules, rules]
-    - changes: &radeonsi_file_list
-        - src/gallium/drivers/radeonsi/**/*
-        - src/gallium/include/winsys/**/*
-        - src/gallium/winsys/amdgpu/**/*
+    - changes: &amd_common_file_list
         - src/amd/*
         - src/amd/addrlib/**/*
         - src/amd/ci/gitlab-ci.yml
@@ -20,6 +17,11 @@
         - src/amd/llvm/**/*
         - src/amd/registers/**/*
       when: on_success
+    - changes: &radeonsi_file_list
+        - src/gallium/drivers/radeonsi/**/*
+        - src/gallium/include/winsys/**/*
+        - src/gallium/winsys/amdgpu/**/*
+      when: on_success
 
 .radv-rules:
   stage: amd
@@ -63,6 +65,9 @@
   rules:
     - !reference [.collabora-farm-rules, rules]
     - !reference [.gl-rules, rules]
+    - changes:
+        *amd_common_file_list
+      when: on_success
     - changes:
         *radeonsi_file_list
       when: on_success
@@ -91,6 +96,9 @@
   rules:
     - !reference [.valve-farm-manual-rules, rules]
     - !reference [.gl-manual-rules, rules]
+    - changes:
+        *amd_common_file_list
+      when: manual
     - changes:
         *radeonsi_file_list
       when: manual