diff --git a/cscs-checks/mch/automatic_arrays.py b/cscs-checks/mch/automatic_arrays.py
index 044b89cd68..9b418ee1ba 100644
--- a/cscs-checks/mch/automatic_arrays.py
+++ b/cscs-checks/mch/automatic_arrays.py
@@ -51,7 +51,7 @@ def __init__(self):
         }
 
         self.maintainers = ['AJ', 'VK']
-        self.tags = {'production'}
+        self.tags = {'production', 'mch'}
 
     def setup(self, partition, environ, **job_opts):
         if environ.name.startswith('PrgEnv-cray'):
diff --git a/cscs-checks/mch/check_ruby.py b/cscs-checks/mch/check_ruby.py
index 6025cd2131..ebc71ae309 100644
--- a/cscs-checks/mch/check_ruby.py
+++ b/cscs-checks/mch/check_ruby.py
@@ -17,4 +17,4 @@ def __init__(self):
                                                r'\[ 1.0, 2.0, 3.0, 4.0 \]',
                                                self.stdout)
         self.maintainers = ['MKr']
-        self.tags = {'production'}
+        self.tags = {'production', 'mch'}
diff --git a/cscs-checks/mch/collectives_halo.py b/cscs-checks/mch/collectives_halo.py
index c49af57b90..88b816b9f7 100644
--- a/cscs-checks/mch/collectives_halo.py
+++ b/cscs-checks/mch/collectives_halo.py
@@ -77,7 +77,7 @@ def __init__(self, variant, bench_reference):
         }
 
         self.maintainers = ['AJ', 'VK']
-        self.tags = {'production'}
+        self.tags = {'production', 'mch'}
 
     def setup(self, *args, **kwargs):
         super().setup(*args, **kwargs)
diff --git a/cscs-checks/mch/cuda_stress_test.py b/cscs-checks/mch/cuda_stress_test.py
index f5a1ce80cf..4caeaefdcc 100644
--- a/cscs-checks/mch/cuda_stress_test.py
+++ b/cscs-checks/mch/cuda_stress_test.py
@@ -36,5 +36,5 @@ def __init__(self):
                 'time': (2.12769, None, 0.05)
             }
         }
-        self.tags = {'production'}
+        self.tags = {'production', 'mch'}
         self.maintainers = ['VK', 'AJ']
diff --git a/cscs-checks/mch/g2g_meteoswiss_check.py b/cscs-checks/mch/g2g_meteoswiss_check.py
index 85d864aa19..9b28869163 100644
--- a/cscs-checks/mch/g2g_meteoswiss_check.py
+++ b/cscs-checks/mch/g2g_meteoswiss_check.py
@@ -29,7 +29,7 @@ def __init__(self, g2g):
                                          '-DENABLE_MPI_TIMER=ON']
         self.build_system.max_concurrency = 1
         self.maintainers = ['TM', 'JG']
-        self.tags = {'production'}
+        self.tags = {'production', 'mch'}
         self.num_tasks = 2
         self.num_gpus_per_node  = 2
         cuda_visible_devices = {1: r'CUDA_VISIBLE_DEVICES: '
diff --git a/cscs-checks/mch/gpu_direct_acc.py b/cscs-checks/mch/gpu_direct_acc.py
index e8725e249a..e6c0024ca9 100644
--- a/cscs-checks/mch/gpu_direct_acc.py
+++ b/cscs-checks/mch/gpu_direct_acc.py
@@ -39,7 +39,7 @@ def __init__(self):
         ])
         self.launch_options = []
         self.maintainers = ['AJ', 'VK']
-        self.tags = {'production'}
+        self.tags = {'production', 'mch'}
 
     def setup(self, partition, environ, **job_opts):
         if environ.name.startswith('PrgEnv-cray'):
diff --git a/cscs-checks/mch/gpu_direct_cuda.py b/cscs-checks/mch/gpu_direct_cuda.py
index 09d3546d4a..5ae22c894a 100644
--- a/cscs-checks/mch/gpu_direct_cuda.py
+++ b/cscs-checks/mch/gpu_direct_cuda.py
@@ -36,4 +36,4 @@ def __init__(self):
                                   self.stdout, 'result', float)
         self.sanity_patterns = sn.assert_reference(result, 1., -1e-5, 1e-5)
         self.maintainers = ['AJ', 'VK']
-        self.tags = {'production'}
+        self.tags = {'production', 'mch'}
diff --git a/cscs-checks/mch/openacc_cuda_mpi_cppstd.py b/cscs-checks/mch/openacc_cuda_mpi_cppstd.py
index 2828542aeb..86f5829d0f 100644
--- a/cscs-checks/mch/openacc_cuda_mpi_cppstd.py
+++ b/cscs-checks/mch/openacc_cuda_mpi_cppstd.py
@@ -42,7 +42,7 @@ def __init__(self):
         self.executable = 'openacc_cuda_mpi_cppstd'
         self.sanity_patterns = sn.assert_found(r'Result:\s+OK', self.stdout)
         self.maintainers = ['AJ', 'VK']
-        self.tags = {'production'}
+        self.tags = {'production', 'mch'}
 
     def setup(self, partition, environ, **job_opts):
         if environ.name.startswith('PrgEnv-cray'):
diff --git a/cscs-checks/tools/io/cdo.py b/cscs-checks/tools/io/cdo.py
index 3f0f07e32d..a002df9bce 100644
--- a/cscs-checks/tools/io/cdo.py
+++ b/cscs-checks/tools/io/cdo.py
@@ -30,7 +30,7 @@ def __init__(self):
         self.sourcesdir = os.path.join(self.current_system.resourcesdir,
                                        'CDO-NCO')
         self.valid_systems = ['daint:gpu', 'daint:mc', 'dom:gpu', 'dom:mc',
-                              'kesch:pn', 'kesch:cn']
+                              'kesch:pn']
         if self.current_system.name == 'kesch':
             self.exclusive_access = True
             self.valid_prog_environs = ['PrgEnv-gnu-nompi']
@@ -40,7 +40,7 @@ def __init__(self):
             self.modules = ['CDO']
 
         self.maintainers = ['SO']
-        self.tags = {'production'}
+        self.tags = {'production', 'mch'}
 
 
 # Check that the netCDF loaded by the CDO module supports the nc4 filetype
diff --git a/cscs-checks/tools/io/nco.py b/cscs-checks/tools/io/nco.py
index f562eb538f..504ebe928c 100644
--- a/cscs-checks/tools/io/nco.py
+++ b/cscs-checks/tools/io/nco.py
@@ -23,7 +23,7 @@ def __init__(self):
         self.sourcesdir = os.path.join(self.current_system.resourcesdir,
                                        'CDO-NCO')
         self.valid_systems = ['daint:gpu', 'daint:mc', 'dom:gpu', 'dom:mc',
-                              'kesch:pn', 'kesch:cn']
+                              'kesch:pn']
         if self.current_system.name == 'kesch':
             self.exclusive_access = True
             self.valid_prog_environs = ['PrgEnv-gnu-nompi']
@@ -33,7 +33,7 @@ def __init__(self):
             self.modules = ['NCO']
 
         self.maintainers = ['SO']
-        self.tags = {'production'}
+        self.tags = {'production', 'mch'}
 
 
 # Check that the netCDF loaded by the NCO module supports the nc4 filetype