diff --git a/scripts/env/envinf1/cli.sh b/scripts/env/envinf1/cli.sh
index e79a200418f039c3c9c433bca0e8442eb2359240..122391701c3439940f39135356dc47191746c74e 100644
--- a/scripts/env/envinf1/cli.sh
+++ b/scripts/env/envinf1/cli.sh
@@ -2,13 +2,13 @@ module use /global/apps/modulefiles
 
 module load cmake
 module load gcc/6.2.0-1
-module load ninja/1.8.2
+module load ninja/1.9.0
 module load git
 
 # Libraries
 module load boost/1.62.0-1
 module load eigen/3.3.4-1-cmake
-module load vtk/8.1.1_gcc-6.2.0_openmpi-1.8.8
+module load vtk/8.2.0/serial
 
 # Tools
 module load coreutils/8.21-1
diff --git a/scripts/env/envinf1/mpi.sh b/scripts/env/envinf1/mpi.sh
index f03066b37a8a8bd9093350706a9f48ea74715c2b..677fe1bceea91b4b91e1d691ee34ce07a0386c83 100644
--- a/scripts/env/envinf1/mpi.sh
+++ b/scripts/env/envinf1/mpi.sh
@@ -1,2 +1,8 @@
-DIR=$( cd $(dirname "${BASH_SOURCE[0]}") ; pwd -P )
+if [ -n "$ZSH_VERSION" ]; then
+    DIR=$( cd $(dirname "${(%):-%x}") ; pwd -P )
+else
+    DIR=$( cd $(dirname "${BASH_SOURCE[0]}") ; pwd -P )
+fi
+
 source $DIR/cli.sh
+module load vtk/8.2.0/openmpi-1.8.8
diff --git a/scripts/env/envinf1/petsc.sh b/scripts/env/envinf1/petsc.sh
index 4c998c33114635f9d3456b6af9f7d5fc432c8751..3034a713cc0a40f2e880d218c1574735a011cb55 100644
--- a/scripts/env/envinf1/petsc.sh
+++ b/scripts/env/envinf1/petsc.sh
@@ -1,3 +1,8 @@
-DIR=$( cd $(dirname "${BASH_SOURCE[0]}") ; pwd -P )
+if [ -n "$ZSH_VERSION" ]; then
+    DIR=$( cd $(dirname "${(%):-%x}") ; pwd -P )
+else
+    DIR=$( cd $(dirname "${BASH_SOURCE[0]}") ; pwd -P )
+fi
+
 source $DIR/mpi.sh
 module load petsc/3.7.6_maint_gcc6.2.0_openmpi_gcc_1.8.8-1