diff --git a/Ubuntu/16.04-OpenFOAM/Ubuntu-16.04-Bootstrap b/Ubuntu/16.04-OpenFOAM/Ubuntu-16.04-Bootstrap
index bee317ebf237abdcc94a93da60a11187298bca82..449fb93580d0c1c01844bcb90dd0dfb573ff389e 100644
--- a/Ubuntu/16.04-OpenFOAM/Ubuntu-16.04-Bootstrap
+++ b/Ubuntu/16.04-OpenFOAM/Ubuntu-16.04-Bootstrap
@@ -4,11 +4,15 @@ From: ubuntu:16.04
 %post
 apt -y update && apt -y upgrade
 apt -y install python curl wget gcc g++ make vim mc libncurses-dev rsync tclsh lua5.2 liblua5.2 gfortran ssh apt-transport-https
+apt -y install dkms infiniband-diags libibverbs* ibacm librdmacm* libmlx4* libmlx5* mstflint libibcm.* libibmad.* libibumad* opensm srptools libmlx4-dev librdmacm-dev rdmacm-utils ibverbs-utils perftest vlan ibutils
+apt -y install libtool autoconf automake build-essential ibutils ibverbs-utils rdmacm-utils infiniband-diags perftest librdmacm-dev libibverbs-dev libmlx4-1 numactl libnuma-dev autoconf automake gcc g++ git libtool pkg-config
+apt -y install libnl-3-200 libnl-route-3-200 libnl-route-3-dev libnl-utils
 
 curl -s -O https://bootstrap.pypa.io/get-pip.py
 python get-pip.py
 pip install setuptools python-graph-core python-graph-dot tabulate numpy scipy pandas wheel --upgrade
 
+cd /tmp
 wget https://github.com/luarocks/luarocks/archive/v2.4.2.tar.gz
 tar xvf v2.4.2.tar.gz
 cd luarocks-2.4.2
@@ -28,6 +32,7 @@ echo "exit 0" >> /bin/logger
 chmod +x /bin/logger
 
 # Lmod
+cd /tmp
 wget https://github.com/TACC/Lmod/archive/7.7.7.tar.gz
 tar xvf 7.7.7.tar.gz
 cd Lmod-7.7.7
@@ -35,9 +40,16 @@ cd Lmod-7.7.7
 make install
 
 # OpenMPI
+cd /tmp
 wget https://www.open-mpi.org/software/ompi/v2.1/downloads/openmpi-2.1.1.tar.gz
 tar xvf openmpi-2.1.1.tar.gz && cd openmpi-2.1.1
-./configure --prefix=/usr/local
+./configure --prefix=/usr/local \
+	--enable-orterun-prefix-by-default \
+	--enable-mpirun-prefix-by-default \
+	--enable-static \
+	--enable-shared \
+	--with-verbs
+
 make -j 16
 make install
 
@@ -58,8 +70,8 @@ mv /opt/monitor /app
 
 ### set-up python3 ###  
 
-apt install -y python3-pip python3-mpi4py
-pip3 install numpy matplotlib
+#apt install -y python3-pip python3-mpi4py
+#pip3 install numpy matplotlib
   
 ### install openfoam ###