diff --git a/var/spack/repos/builtin/packages/rocm-validation-suite/package.py b/var/spack/repos/builtin/packages/rocm-validation-suite/package.py
index af95d70c132..37fa8db2031 100644
--- a/var/spack/repos/builtin/packages/rocm-validation-suite/package.py
+++ b/var/spack/repos/builtin/packages/rocm-validation-suite/package.py
@@ -96,10 +96,14 @@ def patch(self):
             filter_file(
                 r"@ROCM_PATH@/bin", self.spec.prefix.bin, "rvs/conf/deviceid.sh.in", string=True
             )
-        elif self.spec.satisfies("@5.5:"):
+        elif self.spec.satisfies("@5.5:5.7"):
             filter_file(
                 r"@ROCM_PATH@/rvs", self.spec.prefix.rvs, "rvs/conf/deviceid.sh.in", string=True
             )
+        elif self.spec.satisfies("@6.0:"):
+            filter_file(
+                "@ROCM_PATH@/rvs", self.spec.prefix.bin, "rvs/conf/deviceid.sh.in", string=True
+            )
 
     def cmake_args(self):
         args = [