diff --git a/config/cscs.py b/config/cscs.py
index a0de47aaeb..90bab0ca82 100644
--- a/config/cscs.py
+++ b/config/cscs.py
@@ -125,7 +125,7 @@ class ReframeSettings:
                         'environs': ['PrgEnv-gnu', 'PrgEnv-cray',
                                      'PrgEnv-pgi', 'PrgEnv-gnu-gdr',
                                      'PrgEnv-pgi_17.10_gdr', 'PrgEnv-pgi_18.4_gdr',
-                                     'PrgEnv-cray_aj', 'PrgEnv-cray_aj_b'],
+                                     'PrgEnv-cray_gdr', 'PrgEnv-cray_gdr_2.3'],
                         'descr': 'Kesch compute nodes',
                         'resources': {
                             '_rfm_gpu': ['--gres=gpu:{num_gpus_per_node}']
@@ -224,13 +224,13 @@ class ReframeSettings:
                     'cxx': 'mpicxx',
                     'ftn': 'mpif90',
                 },
-                'PrgEnv-cray_aj': {
+                'PrgEnv-cray_gdr': {
                     'type': 'ProgEnvironment',
-                    'modules': ['PrgEnv-cray/1.0.2_aj'],
+                    'modules': ['PrgEnv-cray/1.0.2_gdr'],
                 },
-                'PrgEnv-cray_aj_b': {
+                'PrgEnv-cray_gdr_2.3': {
                     'type': 'ProgEnvironment',
-                    'modules': ['PrgEnv-cray/1.0.2_aj_b'],
+                    'modules': ['PrgEnv-cray/1.0.2_gdr_2.3'],
                 },
                 'PrgEnv-gnu-gdr': {
                     'type': 'ProgEnvironment',