diff --git a/tools/cscs-scripts/build.sh b/tools/cscs-scripts/build.sh
index dadc8642..3ebba574 100755
--- a/tools/cscs-scripts/build.sh
+++ b/tools/cscs-scripts/build.sh
@@ -71,7 +71,9 @@ elif [ "$(hostname | grep kesch)" != "" ] ; then
 elif [ "$(hostname | grep daint)" != "" ] ; then
     MYHOST="daint"
 elif [ "$(hostname | grep arolla)" != "" ] ; then
-    MYHOST="arolla"
+    MYHOST="tsa"
+elif [ "$(hostname | grep tsa)" != "" ] ; then
+    MYHOST="tsa"
 elif [ "$(hostname | grep tave)" != "" ] ; then
     MYHOST="tave"
 else
@@ -195,7 +197,7 @@ fi
 
 #NetCDF
 SERIALBOX_USE_NETCDF=OFF
-if [ "${FC_COMPILER}" = "gfortran" ] && [ "$MYHOST" != "arolla" ]; then
+if [ "${FC_COMPILER}" = "gfortran" ] && [ "$MYHOST" != "tsa" ]; then
     SERIALBOX_USE_NETCDF=ON
 fi
 
diff --git a/tools/cscs-scripts/env_arolla.sh b/tools/cscs-scripts/env_tsa.sh
similarity index 87%
rename from tools/cscs-scripts/env_arolla.sh
rename to tools/cscs-scripts/env_tsa.sh
index e670832c..a996ba69 100755
--- a/tools/cscs-scripts/env_arolla.sh
+++ b/tools/cscs-scripts/env_tsa.sh
@@ -69,25 +69,21 @@ fi
 module load craype-x86-skylake
 module load craype-network-infiniband
 module load slurm
-module load cmake/3.14.3
+module load cmake/3.14.5
 
 if [ "$FC_COMPILER" = "pgfortran" ]; then
-    module load PrgEnv-pgi/19.4
+    module load PrgEnv-pgi
     module load gcc
 elif [ "$FC_COMPILER" = "ftn" ]; then
-    module load PrgEnv-cray
-    module load gcc
+    echo "$FC_COMPILER not available on tsa"
+    exit 1
 elif [ "$FC_COMPILER" = "ifort" ]; then
-    echo "not defined"
+    echo "$FC_COMPILER not available on tsa"
     exit 1
 else
     module load PrgEnv-gnu
 fi
 
-#module load netcdf-c++/4.3.0-gmvolf-18.12
-#module load hdf5/1.10.5-gmvolf-18.12
-#export NETCDF_ROOT=${EBROOTNETCDF}
-
 export CXX=$(which g++)
 export CC=$(which gcc)
 export FC=$(which $FC_COMPILER)
@@ -95,5 +91,5 @@ export FC=$(which $FC_COMPILER)
 export Boost_NO_SYSTEM_PATHS=true
 export Boost_NO_BOOST_CMAKE=true
 
-export BOOST_ROOT=/project/c14/install/daint/boost/boost_1_67_0
+export BOOST_ROOT=/project/c14/install/tsa/boost/boost_1_67_0