diff --git a/tools/cscs-scripts/env_kesch-old.sh b/tools/cscs-scripts/env_kesch-old.sh
deleted file mode 100644
index 3e746ae0..00000000
--- a/tools/cscs-scripts/env_kesch-old.sh
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/bin/bash
-##===-----------------------------------------------------------*- bash -*-===##
-##
-##                           S E R I A L B O X
-##
-## This file is distributed under terms of BSD license. 
-## See LICENSE.txt for more information.
-##
-##===----------------------------------------------------------------------===##
-
-## Print help statement and exit.
-print_help()
-{
-    printf "Usage: $0 [options]\n\n"
-    printf "Options:\n"
-    
-    # --fc-compiler
-    printf "  %-35s %s\n" \
-           "-f, --fc-compiler FORTRAN_COMPILER" \
-           "Fortran compiler to use (set to "
-    printf "  %-35s %s\n" "" "environment variable FC)." 
-   
-    # --help
-    printf "  %-35s %s\n" "-h, --help" "Print this help statement."
-    printf "\n" 
-    exit 0
-}
-
-## Convert to lower case and remove all whitespaces
-to_lower_and_trim()
-{
-    if [ $# -ne 1 ]; then
-        echo "$0: internal error." ; exit 1
-    fi
-    
-    local to_lower=$(echo "$1" | tr '[:upper:]' '[:lower:]')
-    local trim_whitespaces=${to_lower// /}
-    echo "${trim_whitespaces}"
-}
-
-#------------------------------ Parse options ----------------------------------
-ENV_ARGS=$(getopt -o f:h:: -l fc-compiler,help:: -n 'env_kesch' -- "$@");
-
-if [ $? -ne 0 ]; then
-  exit 1
-fi
-
-eval set -- "$ENV_ARGS"
-
-while true; do 
-    case "$1" in
-        -h|--h*) print_help; exit 0;;
-        -f|--fc-compiler) ARG_FC_COMPILER=$(to_lower_and_trim $2); shift 2;;
-        --) shift; break ;;
-        *) echo "$0: internal error." ; exit 1 ;;
-    esac
-done
-
-# Fortran Compiler
-if [ -z ${ARG_FC_COMPILER+x} ]; then
-  echo "$0: error: fortran compiler is not set"
-  exit 1
-else
-  FC_COMPILER=${ARG_FC_COMPILER}
-fi
-
-#------------------------------ Set environment --------------------------------
-
-module purge
-module load cmake/3.9.1
-
-if [ "$FC_COMPILER" = "pgfortran" ]; then
-
-    module load craype-haswell
-    module load craype-accel-nvidia35
-    module switch mvapich2_cce/2.2rc1.0.3_cuda80 mvapich2gdr_gnu/2.2_cuda_8.0
-    module load PrgEnv-pgi/17.10
-    module load gcc/5.4.0-2.26
-    
-elif [ "$FC_COMPILER" = "ftn" ]; then
-    module load craype-haswell
-    module load PrgEnv-cray
-    module load craype-accel-nvidia35
-    module load craype-network-infiniband
-    module switch mvapich2_cce/2.2rc1.0.3_cuda80 mvapich2gdr_gnu/2.2_cuda_8.0
-    module load gcc/5.4.0-2.26
-    export GCC_X86_64=$EBROOTGCCCORE
-else
-    module load PrgEnv-gnu
-fi
-
-export CXX=$(which g++)
-export CC=$(which gcc)
-export FC=$(which $FC_COMPILER)
-
-export Boost_NO_SYSTEM_PATHS=true
-export Boost_NO_BOOST_CMAKE=true
-
-export BOOST_ROOT=/project/c14/install/kesch/boost/boost_1_67_0/
-export BOOST_INCLUDE={BOOST_ROOT}/include/
-
diff --git a/tools/cscs-scripts/env_kesch.sh b/tools/cscs-scripts/env_kesch.sh
index 086a513f..fcbb338f 100644
--- a/tools/cscs-scripts/env_kesch.sh
+++ b/tools/cscs-scripts/env_kesch.sh
@@ -67,36 +67,29 @@ fi
 #------------------------------ Set environment --------------------------------
 
 module purge
-module load cmake/3.9.1
+module load cmake/3.13.4
 
 if [ "$FC_COMPILER" = "pgfortran" ]; then
-
-module unuse /apps/escha/UES/generic/modulefiles:/apps/escha/UES/PrgEnv-gnu-17.02/modulefiles:/apps/escha/UES/PrgEnv-cray-17.06/modulefiles:/apps/escha/UES/experimental/modulefiles
-module use /apps/escha/UES/jenkins/RH7.4/gnu_PE17.02/easybuild/modules/all
-module use /apps/escha/UES/jenkins/RH7.4/generic/easybuild/modules/all
-module use /apps/escha/UES/jenkins/RH7.4/cray_PE17.06/easybuild/modules/all
-
+    module load PE/17.06
     module load craype-haswell
-    module load craype-accel-nvidia35
-    module switch mvapich2_cce/2.2rc1.0.3_cuda80 mvapich2gdr_gnu/2.2_cuda_8.0
-    module load PrgEnv-pgi/17.10
-    module load gcc/5.4.0-2.26
-    
+    module load craype-network-infiniband
+    module load PrgEnv-pgi/18.5
+    module load netcdf-fortran/4.4.4-pgi-18.5-gcc-5.4.0-2.26
 elif [ "$FC_COMPILER" = "ftn" ]; then
-module unuse /apps/escha/UES/generic/modulefiles:/apps/escha/UES/PrgEnv-gnu-17.02/modulefiles:/apps/escha/UES/PrgEnv-cray-17.06/modulefiles:/apps/escha/UES/experimental/modulefiles
-module use /apps/escha/UES/jenkins/RH7.4/gnu_PE17.02/easybuild/modules/all
-module use /apps/escha/UES/jenkins/RH7.4/generic/easybuild/modules/all
-module use /apps/escha/UES/jenkins/RH7.4/cray_PE17.06/easybuild/modules/all
-
-    module load craype-haswell
-    module load PrgEnv-cray
-    module load craype-accel-nvidia35
+    module load PE/17.06
     module load craype-network-infiniband
-    module switch mvapich2_cce/2.2rc1.0.3_cuda80 mvapich2gdr_gnu/2.2_cuda_8.0
-    module load gcc/5.4.0-2.26
+    module load craype-haswell
+    module load craype-accel-nvidia35                                                                                                
+    module swap cudatoolkit/8.0.61
+    module load PrgEnv-CrayCCE/17.06                                                                                                 
+    module load netCDF-Fortran/4.4.4-CrayCCE-17.0
     export GCC_X86_64=$EBROOTGCCCORE
 else
-    module load PrgEnv-gnu
+    module load PE/17.06
+    module load craype-haswell
+    module load craype-network-infiniband
+    module load PrgEnv-gnu/17.02
+    module load netcdf-fortran/4.4.4-gmvolf-17.02
 fi
 
 export CXX=$(which g++)