diff --git a/o/OpenFOAM/OpenFOAM-v1812-foss-2018a.eb b/o/OpenFOAM/OpenFOAM-v1812-foss-2018a.eb
new file mode 100644
index 00000000..c66b32ff
--- /dev/null
+++ b/o/OpenFOAM/OpenFOAM-v1812-foss-2018a.eb
@@ -0,0 +1,39 @@
+# IT4Innovations 2019
+
+name = 'OpenFOAM'
+version = 'v1812'
+
+homepage = 'http://www.openfoam.com/'
+description = """OpenFOAM is a free, open source CFD software package.
+ OpenFOAM has an extensive range of features to solve anything from complex fluid flows
+ involving chemical reactions, turbulence and heat transfer,
+ to solid dynamics and electromagnetics."""
+
+toolchain = {'name': 'foss', 'version': '2018a'}
+toolchainopts = {'cstd': 'c++11'}
+
+source_urls = ['https://sourceforge.net/projects/openfoamplus/files/%(version)s/']
+sources = [SOURCE_TGZ]
+patches = ['OpenFOAM-%(version)s-cleanup.patch']
+checksums = [
+    'd4d23d913419c6a364b1fe91509c1fadb5661bdf2eedb8fe9a8a005924eb2032',  # OpenFOAM-v1812.tgz
+    'a01098181f7ac2a332623b7060bacde03d6ab5479d458189d4934d9f64389f4d',  # OpenFOAM-v1812-cleanup.patch
+]
+
+dependencies = [
+    ('libreadline', '7.0', '', True),
+    ('ncurses', '6.0', '', True),
+    # OpenFOAM requires 64 bit METIS using 32 bit indexes (array indexes)
+    ('METIS', '5.1.0', '', True),
+    ('SCOTCH', '6.0.6'),
+    ('CGAL', '4.11.1'),
+    ('ParaView', '5.4.1', '-mpi'),
+]
+
+builddependencies = [
+    ('Bison', '3.3.2', '', True),
+    ('CMake', '3.13.1', '', True),
+    ('flex', '2.6.4', '', True),
+]
+
+moduleclass = 'cae'
diff --git a/o/OpenFOAM/OpenFOAM-v1906-foss-2018a.eb b/o/OpenFOAM/OpenFOAM-v1906-foss-2018a.eb
index 5d89b150..85111c62 100644
--- a/o/OpenFOAM/OpenFOAM-v1906-foss-2018a.eb
+++ b/o/OpenFOAM/OpenFOAM-v1906-foss-2018a.eb
@@ -17,8 +17,8 @@ sources = [SOURCE_TGZ]
 patches = ['OpenFOAM-%(version)s-cleanup.patch']
 
 dependencies = [
-    ('libreadline', '8.0', '', True),
-    ('ncurses', '6.1', '', True),
+    ('libreadline', '7.0', '', True),
+    ('ncurses', '6.0', '', True),
     # OpenFOAM requires 64 bit METIS using 32 bit indexes (array indexes)
     ('METIS', '5.1.0', '', True),
     ('SCOTCH', '6.0.6'),
@@ -27,7 +27,7 @@ dependencies = [
 ]
 
 builddependencies = [
-    ('Bison', '3.0.5', '', True),
+    ('Bison', '3.0.4', '', True),
     ('CMake', '3.14.1', '', True),
     ('flex', '2.6.4', '', True),
 ]
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
new file mode 100644
index 00000000..0f01381f
--- /dev/null
+++ b/p/PGI/PGI-19.7-GCC-8.2.0-2.31.1-CUDA.eb
@@ -0,0 +1,27 @@
+# IT4Innovations 2019
+
+name = 'PGI'
+version = '19.7'
+
+homepage = 'http://www.pgroup.com/'
+description = "C, C++ and Fortran compilers from The Portland Group - PGI"
+
+toolchain = {'name': 'dummy', 'version': ''}
+
+sources = ['pgilinux-20%(version_major)s-%(version_major)s%(version_minor)s-x86-64.tar.gz']
+
+gccver = '8.2.0'
+binutilsver = '2.31.1'
+versionsuffix = '-GCC-%s-%s' % (gccver, binutilsver)
+
+dependencies = [
+    ('GCCcore', gccver),
+    ('binutils', binutilsver, '', ('GCCcore', gccver)),
+    ('numactl', '2.0.12', '', ('GCCcore', gccver)),
+    ('gcccuda', '2019a'),
+]
+
+# license file
+license_file = '/apps/licenses/pgi/license.dat'
+
+moduleclass = 'compiler'
diff --git a/p/PGI/PGI-19.7-GCC-8.2.0-2.31.1.eb b/p/PGI/PGI-19.7-GCC-8.2.0-2.31.1.eb
index 0f01381f..17081841 100644
--- a/p/PGI/PGI-19.7-GCC-8.2.0-2.31.1.eb
+++ b/p/PGI/PGI-19.7-GCC-8.2.0-2.31.1.eb
@@ -18,7 +18,6 @@ dependencies = [
     ('GCCcore', gccver),
     ('binutils', binutilsver, '', ('GCCcore', gccver)),
     ('numactl', '2.0.12', '', ('GCCcore', gccver)),
-    ('gcccuda', '2019a'),
 ]
 
 # license file