diff --git a/mpcdf_common.py b/mpcdf_common.py
index 21430a21fa9807676a858959a84b7bf7d4cec841..e06248c646d73dc90cde1bf564ad1e4e7521ae69 100644
--- a/mpcdf_common.py
+++ b/mpcdf_common.py
@@ -809,6 +809,13 @@ def openmpi_flavor_dependencies(flavor, distribution):
         return ()
 
 
+def rocm_dependencies(rocm):
+    if rocm == "rocm_6_1":
+        return ()
+    r = rocm.replace("_", "-", 1).replace("_", ".", 1)
+    return (("system:rocm", r),)
+
+
 def openmpi_flavor_kind(flavor):
     import re
     return re.sub("_[0-9_-]+$", "", flavor)
@@ -1085,7 +1092,9 @@ Macros:
 
     for rocm in rocms:
         for compiler in filter(valid_rocm, compilers + amds):
-            repo(rocm + "_" + compiler, ((project, compiler),), rocm=True, rocm_repository=rocm,
+            repo(rocm + "_" + compiler,
+                 rocm_dependencies(rocm) + ((project, compiler),),
+                 rocm=True, rocm_repository=rocm,
                  additional_tags=("Prefer: mpcdf_" + rocm,))
             for mpi in filter(partial(valid_mpi, compiler), filter(is_openmpi, mpis)):
                 repo(rocm + "_" + mpi + "_" + compiler,