diff --git a/p/PGI/PGI-19.4-GCC-8.2.0-2.31.1.eb b/p/PGI/PGI-19.4-GCC-8.2.0-2.31.1.eb
index e560ecea..fd10d88d 100644
--- a/p/PGI/PGI-19.4-GCC-8.2.0-2.31.1.eb
+++ b/p/PGI/PGI-19.4-GCC-8.2.0-2.31.1.eb
@@ -18,10 +18,20 @@ dependencies = [
     ('GCCcore', gccver),
     ('binutils', binutilsver, '', ('GCCcore', gccver)),
     ('numactl', '2.0.12', '', ('GCCcore', gccver)),
-    ('gcccuda', '2019a'),
 ]
 
+configopts = 'export PGI_INSTALL_MPI=true &&'
+
 # license file
 license_file = '/apps/licenses/pgi/license.dat'
 
+modextrapaths = {
+    'PATH': 'linux86-64-llvm/2019/mpi/openmpi-3.1.3/bin',
+    'LD_LIBRARY_PATH': 'linux86-64-llvm/2019/mpi/openmpi-3.1.3/lib',
+    'LIBRARY_PATH': 'linux86-64-llvm/2019/mpi/openmpi-3.1.3/lib',
+    'CPATH': 'linux86-64-llvm/2019/mpi/openmpi-3.1.3/include',
+    'MANPATH': 'linux86-64-llvm/2019/mpi/openmpi-3.1.3/share/man',
+    'PKG_CONFIG_PATH': 'linux86-64-llvm/2019/mpi/openmpi-3.1.3/lib/pkgconfig',
+}
+
 moduleclass = 'compiler'
diff --git a/p/PGI/PGI-19.7-GCC-8.2.0-2.31.1-CUDA.eb b/p/PGI/PGI-19.7-GCC-8.2.0-2.31.1-CUDA.eb
index 8d553427..5b7cbe24 100644
--- a/p/PGI/PGI-19.7-GCC-8.2.0-2.31.1-CUDA.eb
+++ b/p/PGI/PGI-19.7-GCC-8.2.0-2.31.1-CUDA.eb
@@ -21,7 +21,18 @@ dependencies = [
     ('gcccuda', '2019a'),
 ]
 
+configopts = 'export PGI_INSTALL_MPI=true &&'
+
 # license file
 license_file = '/apps/licenses/pgi/license.dat'
 
+modextrapaths = {
+    'PATH': 'linux86-64-llvm/2019/mpi/openmpi-3.1.3/bin',
+    'LD_LIBRARY_PATH': 'linux86-64-llvm/2019/mpi/openmpi-3.1.3/lib',
+    'LIBRARY_PATH': 'linux86-64-llvm/2019/mpi/openmpi-3.1.3/lib',
+    'CPATH': 'linux86-64-llvm/2019/mpi/openmpi-3.1.3/include',
+    'MANPATH': 'linux86-64-llvm/2019/mpi/openmpi-3.1.3/share/man',
+    'PKG_CONFIG_PATH': 'linux86-64-llvm/2019/mpi/openmpi-3.1.3/lib/pkgconfig',
+}
+
 moduleclass = 'compiler'