diff --git a/scripts/env/frontend1/cli.sh b/scripts/env/frontend1/cli.sh
index 902326ff3f215cd510d07eba20af13cb084e3758..de2a2d8eebb5aa5e74c345d662cefd498e3aa221 100644
--- a/scripts/env/frontend1/cli.sh
+++ b/scripts/env/frontend1/cli.sh
@@ -1,14 +1,14 @@
 module use /global/apps/modulefiles
 
 module load cmake
-module load gcc/6.2.0-1
+module load foss/2018b
 module load ninja/1.9.0
 module load git/2.20.1
 
 # Libraries
 module load boost/1.62.0-1
 module load eigen/3.3.4-1-cmake
-module load vtk/8.2.0/serial
+module load vtk/8.2.0/foss2018b/serial
 
 # Tools
 module load coreutils/8.21-1
diff --git a/scripts/env/frontend1/mpi.sh b/scripts/env/frontend1/mpi.sh
index 2cdbd4b6c71cf01906d3221eda876a6541267980..50cfa715bfaf5ac6ef2308a3526ccbeacebca69e 100644
--- a/scripts/env/frontend1/mpi.sh
+++ b/scripts/env/frontend1/mpi.sh
@@ -5,6 +5,6 @@ else
 fi
 
 source $DIR/cli.sh
-module load vtk/8.2.0/openmpi-4.0.0
-CC=mpicc
-CXX=mpic++
+module load vtk/8.2.0/foss2018b/openmpi
+export CC=mpicc
+export CXX=mpic++
diff --git a/scripts/env/frontend1/petsc.sh b/scripts/env/frontend1/petsc.sh
index 2e1800c90c7fc5d0170bb747f3dbe1001a975f93..607ad99db5edd0cf8833ad206071050d30f131d1 100644
--- a/scripts/env/frontend1/petsc.sh
+++ b/scripts/env/frontend1/petsc.sh
@@ -5,7 +5,7 @@ else
 fi
 
 source $DIR/mpi.sh
-module load petsc-bilke/3.11.0-openmpi-4.0.0
+module load petsc-bilke/3.11.0-foss2018b
 echo -e "Note: If you want to run a simulation on the cluster be aware of the "\
      "mixed CPU architecture. There are Sandy-Bridge-based nodes (orte-28, "\
      "frontend2, envinf1) as well as Skylake-based nodes (orte-40, frontend1)"\