diff --git a/mpcdf_common.py b/mpcdf_common.py
index d7c35bfe626fc845095e34bb4f4ec6d68aa43f41..ee6b204a14abd9cbf612f8912338f08f3ab7fa34 100644
--- a/mpcdf_common.py
+++ b/mpcdf_common.py
@@ -409,10 +409,12 @@ def mpcdf_setup_repositories(api_url, project, distribution=None, parent=None, p
         repo("System", ("distributions", distribution))
 
     for compiler in compilers + pgis:
-        repo(compiler, (project, "System"), compiler=True)
+        repo(compiler, (project, "System"), compiler=True,
+             compiler_repository=compiler)
 
         for mpi in filter(partial(valid_mpi, compiler), mpis):
-            repo(mpi + "_" + compiler, (project, compiler), mpi=True, mpi_repository=mpi)
+            repo(mpi + "_" + compiler, (project, compiler), mpi=True,
+                 mpi_repository=mpi, compiler_repository=compiler)
 
     for cuda in cudas:
         for compiler in filter(partial(valid_cuda, cuda), compilers):