diff --git a/mpcdf_common.py b/mpcdf_common.py
index 704435604f711f73816984662c9e494fc5585994..91534463d712ca67b6d6fadea3ea9aea7a64d4b5 100644
--- a/mpcdf_common.py
+++ b/mpcdf_common.py
@@ -46,6 +46,8 @@ def valid_cuda(cuda, compiler):
         return compiler == "gcc_5"
     if cuda == "cuda_9_1":
         return compiler == "gcc_6_3_0"
+    if cuda == "cuda_9_2":
+        return compiler == "gcc_7"
     return False
 
 
@@ -189,10 +191,10 @@ def mpcdf_enable_repositories(api_url, project, package, verbose=False):
     def actual_compilers():
         for compiler in compilers:
             if compiler == "intel":
-                for intel_compiler in filter(lambda cc: cc.startswith("intel"), compilers):
+                for intel_compiler in filter(lambda cc: cc.startswith("intel"), all_compilers):
                     yield intel_compiler
             elif compiler == "gcc":
-                for gcc_compiler in filter(lambda cc: cc.startswith("gcc"), compilers):
+                for gcc_compiler in filter(lambda cc: cc.startswith("gcc"), all_compilers):
                     yield gcc_compiler
             elif compiler == "default_compiler":
                 for default_compiler in default_compilers:
@@ -226,7 +228,7 @@ def mpcdf_enable_repositories(api_url, project, package, verbose=False):
 
         if flag == "compilers":
             for compiler in actual_compilers():
-                    enable(compiler)
+                enable(compiler)
 
         if flag == "mpi":
             for mpi, compiler in product(actual_mpis(), actual_compilers()):