diff --git a/mpcdf_common.py b/mpcdf_common.py
index ec7be3dea6dee68890a526fbe9810e68c3e4d8f6..9eeb2b10e280f45f9fed1de494899dd7d9a22bd4 100644
--- a/mpcdf_common.py
+++ b/mpcdf_common.py
@@ -7,6 +7,7 @@ import textwrap
 import urllib
 from typing import Optional
 from functools import partial
+from itertools import chain
 from xml.etree import ElementTree
 
 if sys.version_info[0] < 3:
@@ -688,12 +689,12 @@ def mpcdf_enable_repositories(api_url, project, package, verbose=False, dry_run=
                             enable(mpi + "_" + compiler + "_" + of)
 
             if flag == "cuda":
-                for cuda, compiler in product(actual_cudas(), all_compilers + all_pgis):
+                for cuda, compiler in product(actual_cudas(), chain(actual_compilers(), actual_pgis())):
                     if valid_cuda(cuda, compiler):
                         enable(cuda + "_" + compiler)
 
             if flag == "cuda_mpi":
-                for cuda, mpi, compiler in product(actual_cudas(), actual_mpis(), all_compilers):
+                for cuda, mpi, compiler in product(actual_cudas(), actual_mpis(), actual_compilers()):
                     if valid_cuda(cuda, compiler) and valid_mpi(compiler, mpi):
                         enable(cuda + "_" + mpi + "_" + compiler)
 
@@ -707,22 +708,22 @@ def mpcdf_enable_repositories(api_url, project, package, verbose=False, dry_run=
                         enable(mpi + "_" + amd)
 
             if flag == "rocm":
-                for rocm, compiler in product(actual_rocms(), all_compilers + all_amds):
+                for rocm, compiler in product(actual_rocms(), chain(actual_compilers(), actual_amds())):
                     if valid_rocm(compiler):
                         enable(rocm + "_" + compiler)
 
             if flag == "rocm_mpi":
-                for rocm, mpi, compiler in product(actual_rocms(), actual_mpis(), all_compilers + all_amds):
+                for rocm, mpi, compiler in product(actual_rocms(), actual_mpis(), chain(actual_compilers(), actual_amds())):
                     if valid_rocm(compiler) and is_openmpi(mpi) and valid_mpi(compiler, mpi):
                         enable(rocm + "_" + mpi + "_" + compiler)
 
             if flag == "rocm_aware_mpi":
-                for rocm, mpi, compiler in product(actual_rocms(), actual_mpis(), all_compilers + all_amds):
+                for rocm, mpi, compiler in product(actual_rocms(), actual_mpis(), chain(actual_compilers(), actual_amds())):
                     if valid_rocm(compiler) and is_openmpi(mpi) and valid_mpi(compiler, mpi):
                         enable(rocm + "_aware_" + mpi + "_" + compiler)
 
             if flag == "rocm_aware_openmpi_flavors":
-                for rocm, mpi, compiler in product(actual_rocms(), actual_mpis(), all_compilers + all_amds):
+                for rocm, mpi, compiler in product(actual_rocms(), actual_mpis(), chain(actual_compilers(), actual_amds())):
                     if valid_rocm(compiler) and is_openmpi(mpi) and valid_mpi(compiler, mpi):
                         for of in actual_openmpi_flavors():
                             enable(rocm + "_aware_" + mpi + "_" + compiler + "_" + of)
@@ -737,12 +738,12 @@ def mpcdf_enable_repositories(api_url, project, package, verbose=False, dry_run=
                         enable(mpi + "_" + pgi)
 
             if flag == "cuda_aware_mpi":
-                for cuda, mpi, compiler in product(actual_cudas(), actual_mpis(), all_compilers + all_pgis):
+                for cuda, mpi, compiler in product(actual_cudas(), actual_mpis(), chain(actual_compilers(), actual_pgis())):
                     if "openmpi" in mpi and valid_cuda(cuda, compiler) and valid_mpi(compiler, mpi):
                         enable(cuda + "_aware_" + mpi + "_" + compiler)
 
             if flag == "cuda_aware_openmpi_flavors":
-                for cuda, mpi, compiler in product(actual_cudas(), actual_mpis(), all_compilers + all_pgis):
+                for cuda, mpi, compiler in product(actual_cudas(), actual_mpis(), chain(actual_compilers(), actual_pgis())):
                     if "openmpi" in mpi and valid_cuda(cuda, compiler) and valid_mpi(compiler, mpi):
                         for of in actual_openmpi_flavors():
                             enable(cuda + "_aware_" + mpi + "_" + compiler + "_" + of)