diff --git a/p/PGI/PGI-19.4-GCC-8.3.0-2.32.eb b/p/PGI/PGI-19.4-GCC-8.3.0-2.32.eb
new file mode 100644
index 00000000..be06688a
--- /dev/null
+++ b/p/PGI/PGI-19.4-GCC-8.3.0-2.32.eb
@@ -0,0 +1,53 @@
+# IT4Innovations 2020
+
+name = 'PGI'
+version = '19.4'
+
+homepage = 'http://www.pgroup.com/'
+description = "C, C++ and Fortran local_compilers from The Portland Group - PGI"
+
+toolchain = SYSTEM
+
+sources = ['pgilinux-20%(version_major)s-%(version_major)s%(version_minor)s-x86-64.tar.gz']
+
+local_local_gccver = '8.3.0'
+local_local_local_binutilsver = '2.32'
+versionsuffix = '-GCC-%s-%s' % (local_local_gccver, local_local_local_binutilsver)
+
+dependencies = [
+    ('GCCcore', local_local_gccver),
+    ('binutils', local_local_local_binutilsver, '', ('GCCcore', local_local_gccver)),
+    ('numactl', '2.0.12', '', ('GCCcore', local_local_gccver)),
+]
+
+configopts = 'export PGI_INSTALL_MPI=true &&'
+
+# license file
+license_file = '/apps/licenses/pgi/license.dat'
+
+import os
+if os.environ.get("CLUSTERNAME") in ["BARBORA"]:
+   modextravars = {
+     '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',
+     'OMPI_MCA_btl_openib_if_include': 'mlx5_0',
+     'OMPI_MCA_btl_tcp_if_include': '10.33.4.0/24',
+     'OMPI_MCA_orte_base_help_aggregate': '0',
+   }
+else:
+   modextravars = {
+     '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',
+     'OMPI_MCA_btl_openib_if_include': 'mlx4_0',
+     'OMPI_MCA_oob_tcp_if_include': '10.0.0.0/8',
+   }
+
+moduleclass = 'compiler'
diff --git a/p/PGI/PGI-20.1-GCC-8.3.0-2.32.eb b/p/PGI/PGI-20.1-GCC-8.3.0-2.32.eb
new file mode 100644
index 00000000..6aa22f12
--- /dev/null
+++ b/p/PGI/PGI-20.1-GCC-8.3.0-2.32.eb
@@ -0,0 +1,53 @@
+# IT4Innovations 2020
+
+name = 'PGI'
+version = '20.1'
+
+homepage = 'http://www.pgroup.com/'
+description = "C, C++ and Fortran local_compilers from The Portland Group - PGI"
+
+toolchain = SYSTEM
+
+sources = ['pgilinux-20%(version_major)s-%(version_major)s%(version_minor)s-x86-64.tar.gz']
+
+local_local_gccver = '8.3.0'
+local_local_local_binutilsver = '2.32'
+versionsuffix = '-GCC-%s-%s' % (local_local_gccver, local_local_local_binutilsver)
+
+dependencies = [
+    ('GCCcore', local_local_gccver),
+    ('binutils', local_local_local_binutilsver, '', ('GCCcore', local_local_gccver)),
+    ('numactl', '2.0.12', '', ('GCCcore', local_local_gccver)),
+]
+
+configopts = 'export PGI_INSTALL_MPI=true &&'
+
+# license file
+license_file = '/apps/licenses/pgi/license.dat'
+
+import os
+if os.environ.get("CLUSTERNAME") in ["BARBORA"]:
+   modextravars = {
+     'PATH': 'linux86-64-llvm/2020/mpi/openmpi-3.1.3/bin',
+     'LD_LIBRARY_PATH': 'linux86-64-llvm/2020/mpi/openmpi-3.1.3/lib',
+     'LIBRARY_PATH': 'linux86-64-llvm/2020/mpi/openmpi-3.1.3/lib',
+     'CPATH': 'linux86-64-llvm/2020/mpi/openmpi-3.1.3/include',
+     'MANPATH': 'linux86-64-llvm/2020/mpi/openmpi-3.1.3/share/man',
+     'PKG_CONFIG_PATH': 'linux86-64-llvm/2020/mpi/openmpi-3.1.3/lib/pkgconfig',
+     'OMPI_MCA_btl_openib_if_include': 'mlx5_0',
+     'OMPI_MCA_btl_tcp_if_include': '10.33.4.0/24',
+     'OMPI_MCA_orte_base_help_aggregate': '0',
+   }
+else:
+   modextravars = {
+     'PATH': 'linux86-64-llvm/2020/mpi/openmpi-3.1.3/bin',
+     'LD_LIBRARY_PATH': 'linux86-64-llvm/2020/mpi/openmpi-3.1.3/lib',
+     'LIBRARY_PATH': 'linux86-64-llvm/2020/mpi/openmpi-3.1.3/lib',
+     'CPATH': 'linux86-64-llvm/2020/mpi/openmpi-3.1.3/include',
+     'MANPATH': 'linux86-64-llvm/2020/mpi/openmpi-3.1.3/share/man',
+     'PKG_CONFIG_PATH': 'linux86-64-llvm/2020/mpi/openmpi-3.1.3/lib/pkgconfig',
+     'OMPI_MCA_btl_openib_if_include': 'mlx4_0',
+     'OMPI_MCA_oob_tcp_if_include': '10.0.0.0/8',
+   }
+
+moduleclass = 'compiler'
diff --git a/v/Valgrind/Valgrind-3.15.0-GCC-8.3.0-2.32.eb b/v/Valgrind/Valgrind-3.15.0-GCC-8.3.0-2.32.eb
new file mode 100644
index 00000000..9132c05e
--- /dev/null
+++ b/v/Valgrind/Valgrind-3.15.0-GCC-8.3.0-2.32.eb
@@ -0,0 +1,31 @@
+# IT4Innovations 2020
+
+easyblock = 'ConfigureMake'
+
+name = 'Valgrind'
+version = "3.15.0"
+
+homepage = 'http://valgrind.org/downloads/'
+description = "Valgrind: Debugging and profiling tools"
+
+toolchain = {'name': 'GCC', 'version': '8.3.0-2.32'}
+toolchainopts = {'optarch': False}
+
+source_urls = ['https://sourceware.org/pub/valgrind/']
+sources = [SOURCELOWER_TAR_BZ2]
+
+#configopts = ' --with-mpicc="$MPICC"'
+
+local_binaries = [
+    'callgrind_annotate', 'callgrind_control', 'cg_annotate', 'cg_diff',
+    'cg_merge', 'ms_print', 'valgrind', 'valgrind-listener', 'vgdb'
+]
+
+sanity_check_paths = {
+    'files': ['bin/%s' % x for x in local_binaries],
+    'dirs': []
+}
+
+parallel = 1
+
+moduleclass = 'debugger'
diff --git a/v/Valgrind/Valgrind-3.15.0-intel-2017c.eb b/v/Valgrind/Valgrind-3.15.0-intel-2017c.eb
index 9e20db54..46f61311 100644
--- a/v/Valgrind/Valgrind-3.15.0-intel-2017c.eb
+++ b/v/Valgrind/Valgrind-3.15.0-intel-2017c.eb
@@ -11,18 +11,18 @@ description = "Valgrind: Debugging and profiling tools"
 toolchain = {'name': 'intel', 'version': '2017c'}
 toolchainopts = {'optarch': False}
 
-source_urls = ['https://sourceware.org/ftp/valgrind/']
+source_urls = ['https://sourceware.org/pub/valgrind/']
 sources = [SOURCELOWER_TAR_BZ2]
 
 configopts = ' --with-mpicc="$MPICC"'
 
-binaries = [
+local_binaries = [
     'callgrind_annotate', 'callgrind_control', 'cg_annotate', 'cg_diff',
     'cg_merge', 'ms_print', 'valgrind', 'valgrind-listener', 'vgdb'
 ]
 
 sanity_check_paths = {
-    'files': ['bin/%s' % x for x in binaries],
+    'files': ['bin/%s' % x for x in local_binaries],
     'dirs': []
 }
 
diff --git a/v/Valgrind/Valgrind-3.15.0.eb b/v/Valgrind/Valgrind-3.15.0.eb
new file mode 100644
index 00000000..3affb103
--- /dev/null
+++ b/v/Valgrind/Valgrind-3.15.0.eb
@@ -0,0 +1,31 @@
+# IT4Innovations 2020
+
+easyblock = 'ConfigureMake'
+
+name = 'Valgrind'
+version = "3.15.0"
+
+homepage = 'http://valgrind.org/downloads/'
+description = "Valgrind: Debugging and profiling tools"
+
+toolchain = SYSTEM
+toolchainopts = {'optarch': False}
+
+source_urls = ['https://sourceware.org/pub/valgrind/']
+sources = [SOURCELOWER_TAR_BZ2]
+
+#onfigopts = ' --with-mpicc="$MPICC"'
+
+local_binaries = [
+    'callgrind_annotate', 'callgrind_control', 'cg_annotate', 'cg_diff',
+    'cg_merge', 'ms_print', 'valgrind', 'valgrind-listener', 'vgdb'
+]
+
+sanity_check_paths = {
+    'files': ['bin/%s' % x for x in local_binaries],
+    'dirs': []
+}
+
+parallel = 1
+
+moduleclass = 'debugger'