diff --git a/Custom_EasyBlocks/2019a/cmakemake.py b/Custom_EasyBlocks/2019a/cmakemake.py
index 0df8b20846f10339936f428b1cc9d322e18cef1e..8e414feba3f52599e2293933adb92ab4c3f2d9a4 100644
--- a/Custom_EasyBlocks/2019a/cmakemake.py
+++ b/Custom_EasyBlocks/2019a/cmakemake.py
@@ -42,8 +42,7 @@ from easybuild.tools.filetools import change_dir, mkdir, which
from easybuild.tools.environment import setvar
from easybuild.tools.modules import get_software_root
from easybuild.tools.run import run_cmd
-#from easybuild.tools.utilities import nub
-from vsc.utils.missing import nub
+from easybuild.tools.utilities import nub
DEFAULT_CONFIGURE_CMD = 'cmake'
diff --git a/Custom_EasyBlocks/2019a/elpa.py b/Custom_EasyBlocks/2019a/elpa.py
index c78656e914d665ecbad4ba27d47e0efba23c58f0..39cb61009d6ee906e484aee8dc3301acd20da8c7 100644
--- a/Custom_EasyBlocks/2019a/elpa.py
+++ b/Custom_EasyBlocks/2019a/elpa.py
@@ -28,8 +28,7 @@ EasyBuild support for building and installing ELPA, implemented as an easyblock
@author: Micael Oliveira (MPSD-Hamburg)
"""
-#from easybuild.tools.utilities import nub
-from vsc.utils.missing import nub
+from easybuild.tools.utilities import nub
from easybuild.easyblocks.generic.configuremake import ConfigureMake
from easybuild.framework.easyconfig import CUSTOM
diff --git a/Custom_MNS/2019a/custom_hierarchical_mns.py b/Custom_MNS/2019a/custom_hierarchical_mns.py
index 935f72ff19810c201dec42799856c7254112bdba..3c5ae5bd6bf8e2f70c88f99dfb8801fb62454843 100755
--- a/Custom_MNS/2019a/custom_hierarchical_mns.py
+++ b/Custom_MNS/2019a/custom_hierarchical_mns.py
@@ -31,8 +31,7 @@ Implementation of an example hierarchical module naming scheme.
import os
import re
-from vsc.utils import fancylogger
-#from easybuild.base import fancylogger
+from easybuild.base import fancylogger
from easybuild.tools.build_log import EasyBuildError
from easybuild.tools.module_naming_scheme.hierarchical_mns import HierarchicalMNS
diff --git a/Custom_MNS/2019a/flexible_custom_hierarchical_mns.py b/Custom_MNS/2019a/flexible_custom_hierarchical_mns.py
index 39b86e38a3be8bacfc68036ea5177db1209ab0e8..dd4c0c97503f49877b60f1db8047c11f6cb10814 100755
--- a/Custom_MNS/2019a/flexible_custom_hierarchical_mns.py
+++ b/Custom_MNS/2019a/flexible_custom_hierarchical_mns.py
@@ -9,8 +9,7 @@ Implementation of a hierarchical module naming scheme, with added flexibility
import os
import re
-from vsc.utils import fancylogger
-#from easybuild.base import fancylogger
+from easybuild.base import fancylogger
from easybuild.tools.build_log import EasyBuildError
from easybuild.tools.module_naming_scheme.hierarchical_mns import HierarchicalMNS
@@ -39,7 +38,7 @@ comp_relevant_versions = {
'intel': 1,
'PGI': 1,
# The compilers load GCCcore/version. So GCC and GCCcore can't really be flexible, since GCCcore will always be loaded
-# as a dependency with a full version, and GCC it nothing but a bundle around GCCcore + binutils
+# as a dependency with a full version, and GCC is nothing but a bundle around GCCcore + binutils
# 'GCC': 1,
# 'GCCcore': 1,
}
diff --git a/Golden_Repo/2019a/a/ARMForge/ARMForge-19.0.4.eb b/Golden_Repo/2019a/a/ARMForge/ARMForge-19.0.4.eb
index 154f3b90240bcd52c3e65f515b5aab6991b74054..92ed9cfe34a03b6ecffd15f67123d1b908badfaa 100644
--- a/Golden_Repo/2019a/a/ARMForge/ARMForge-19.0.4.eb
+++ b/Golden_Repo/2019a/a/ARMForge/ARMForge-19.0.4.eb
@@ -17,7 +17,7 @@ For the ARM DDT and MAP User Guide, please see: "$EBROOTARMFORGE/doc/userguide.p
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'version': 'dummy', 'name': 'dummy'}
+toolchain = SYSTEM
sources = ['arm-forge-%(version)s-Redhat-7.0-x86_64.tar']
#http://content.allinea.com/downloads/allinea-tools-4.2-PR-39422-Redhat-6.0-x86_64.tar
diff --git a/Golden_Repo/2019a/a/ARMPerformanceReports/ARMPerformanceReports-19.0.4.eb b/Golden_Repo/2019a/a/ARMPerformanceReports/ARMPerformanceReports-19.0.4.eb
index 81b9903542a6107c6a1018b5ca8ccf88c226e211..c17605b07506f776350eac50bb8ddff71bb0d1f1 100644
--- a/Golden_Repo/2019a/a/ARMPerformanceReports/ARMPerformanceReports-19.0.4.eb
+++ b/Golden_Repo/2019a/a/ARMPerformanceReports/ARMPerformanceReports-19.0.4.eb
@@ -20,7 +20,7 @@ will be created in the current directory on completion.
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'version': 'dummy', 'name': 'dummy'}
+toolchain = SYSTEM
sources = ['arm-reports-%(version)s-Redhat-7.0-x86_64.tar']
source_urls = ['http://content.allinea.com/downloads/']
diff --git a/Golden_Repo/2019a/a/Advisor/Advisor-2019_update3.eb b/Golden_Repo/2019a/a/Advisor/Advisor-2019_update3.eb
index dcb70d64f11a7abafac30a395e084da53a1bf30c..6fe90593b69784e955e6fe3ef3aa4b8e9c79cd85 100644
--- a/Golden_Repo/2019a/a/Advisor/Advisor-2019_update3.eb
+++ b/Golden_Repo/2019a/a/Advisor/Advisor-2019_update3.eb
@@ -10,7 +10,7 @@ description = """Vectorization Optimization and Thread Prototyping
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
sources = ['advisor_%(version)s.tar.gz']
diff --git a/Golden_Repo/2019a/a/Advisor/Advisor-2019_update5.eb b/Golden_Repo/2019a/a/Advisor/Advisor-2019_update5.eb
index 6c5a25c9345d9f4b3cfe4c63a2068079a961305b..616b4228c3fe8810da745c72a8086d341affa550 100644
--- a/Golden_Repo/2019a/a/Advisor/Advisor-2019_update5.eb
+++ b/Golden_Repo/2019a/a/Advisor/Advisor-2019_update5.eb
@@ -10,7 +10,7 @@ description = """Vectorization Optimization and Thread Prototyping
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
sources = ['advisor_%(version)s.tar.gz']
diff --git a/Golden_Repo/2019a/a/Autoconf/Autoconf-2.69.eb b/Golden_Repo/2019a/a/Autoconf/Autoconf-2.69.eb
index fcbca4609f2037971d297a1c4d8904b81abeaa10..e7ce4e8f2e85610c01ae28b10c98fbdbe0a88241 100644
--- a/Golden_Repo/2019a/a/Autoconf/Autoconf-2.69.eb
+++ b/Golden_Repo/2019a/a/Autoconf/Autoconf-2.69.eb
@@ -13,7 +13,7 @@ description = """Autoconf is an extensible package of M4 macros that produce she
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = [GNU_SOURCE]
sources = [SOURCELOWER_TAR_GZ]
diff --git a/Golden_Repo/2019a/a/Automake/Automake-1.16.1.eb b/Golden_Repo/2019a/a/Automake/Automake-1.16.1.eb
index c5e7329e9843a8a27365db89d8298e0b956c7209..5642e478ce5c46427c5487ce75bf5d3a4f61ec7a 100644
--- a/Golden_Repo/2019a/a/Automake/Automake-1.16.1.eb
+++ b/Golden_Repo/2019a/a/Automake/Automake-1.16.1.eb
@@ -22,7 +22,7 @@ Automake: GNU Standards-compliant Makefile generator
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = [GNU_SOURCE]
sources = [SOURCELOWER_TAR_GZ]
diff --git a/Golden_Repo/2019a/a/Autotools/Autotools-20180311.eb b/Golden_Repo/2019a/a/Autotools/Autotools-20180311.eb
index fb45db3decbad2b9f3ef266c2a3e6a56ca4bdfac..dfc52fcca35dbad98a16066607d52650b368b5cd 100644
--- a/Golden_Repo/2019a/a/Autotools/Autotools-20180311.eb
+++ b/Golden_Repo/2019a/a/Autotools/Autotools-20180311.eb
@@ -10,7 +10,7 @@ description = """
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
dependencies = [
('Autoconf', '2.69'), # 20120424
diff --git a/Golden_Repo/2019a/a/ant/ant-1.10.1.eb b/Golden_Repo/2019a/a/ant/ant-1.10.1.eb
index c00158cb445a62bca34929e8016abecfada005c0..3de9f7e8056f4e6c81b920da90e06a6ed270bbbf 100644
--- a/Golden_Repo/2019a/a/ant/ant-1.10.1.eb
+++ b/Golden_Repo/2019a/a/ant/ant-1.10.1.eb
@@ -8,7 +8,7 @@ description = """Apache Ant is a Java library and command-line tool whose missio
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': ''}
+toolchain = SYSTEM
sources = ['apache-%(name)s-%(version)s-src.tar.gz']
source_urls = ['http://archive.apache.org/dist/%(name)s/source/']
diff --git a/Golden_Repo/2019a/b/Bison/Bison-3.3.2.eb b/Golden_Repo/2019a/b/Bison/Bison-3.3.2.eb
index ed47c3e9d54d500c490abcac43e4590bafd840ff..2e2b0c303f78953275eb74ad10a48b9906e31dd8 100644
--- a/Golden_Repo/2019a/b/Bison/Bison-3.3.2.eb
+++ b/Golden_Repo/2019a/b/Bison/Bison-3.3.2.eb
@@ -10,7 +10,7 @@ into a deterministic LR or generalized LR (GLR) parser employing LALR(1) parser
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': ''}
+toolchain = SYSTEM
sources = [SOURCELOWER_TAR_GZ]
source_urls = [GNU_SOURCE]
diff --git a/Golden_Repo/2019a/b/binutils/binutils-2.32.eb b/Golden_Repo/2019a/b/binutils/binutils-2.32.eb
index 5291e20ade776794cedfd871772803cc993bca9b..fb031b69df8db5e3e7fe0ed2ddc18a4e8b549896 100644
--- a/Golden_Repo/2019a/b/binutils/binutils-2.32.eb
+++ b/Golden_Repo/2019a/b/binutils/binutils-2.32.eb
@@ -10,7 +10,7 @@ description = """
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': ''}
+toolchain = SYSTEM
toolchainopts = {'pic': True}
sources = [SOURCE_TAR_GZ]
diff --git a/Golden_Repo/2019a/c/CUDA/CUDA-10.1.105.eb b/Golden_Repo/2019a/c/CUDA/CUDA-10.1.105.eb
index e3fdd05231fe12a23058f49d3dea3cbe1ab3c610..cb8a1a8e9c37ce8b5679b4abc1da7c356348909a 100644
--- a/Golden_Repo/2019a/c/CUDA/CUDA-10.1.105.eb
+++ b/Golden_Repo/2019a/c/CUDA/CUDA-10.1.105.eb
@@ -11,7 +11,7 @@ description = """CUDA (formerly Compute Unified Device Architecture) is a parall
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = [
'http://developer.download.nvidia.com/compute/cuda/%(version_major_minor)s/Prod/local_installers/',
diff --git a/Golden_Repo/2019a/c/Camino/Camino-20190201.eb b/Golden_Repo/2019a/c/Camino/Camino-20190201.eb
index c9875c255457a3f9a78d521aed104558dc3e922c..f85073e8ef00365c4846a403bbdc26e3bc19c2e3 100644
--- a/Golden_Repo/2019a/c/Camino/Camino-20190201.eb
+++ b/Golden_Repo/2019a/c/Camino/Camino-20190201.eb
@@ -8,7 +8,7 @@ description = "Camino is a free, open-source software package for analysis and r
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': ''}
+toolchain = SYSTEM
toolchainopts = {'pic': True}
code_hash = '1c4ef77615d103d43adcff6c79b72d0bbdac0897'
diff --git a/Golden_Repo/2019a/c/cuDNN/cuDNN-7.5.1.10-CUDA-10.1.105.eb b/Golden_Repo/2019a/c/cuDNN/cuDNN-7.5.1.10-CUDA-10.1.105.eb
index e42893c24eef72a5650a35f6e1dc7cd9c6f2e641..9cf697cff0d013a36a44c92b9372ecf5516935ed 100644
--- a/Golden_Repo/2019a/c/cuDNN/cuDNN-7.5.1.10-CUDA-10.1.105.eb
+++ b/Golden_Repo/2019a/c/cuDNN/cuDNN-7.5.1.10-CUDA-10.1.105.eb
@@ -19,7 +19,7 @@ deep neural networks."""
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
# Nvidia developer registration required.
# Download link: https://developer.nvidia.com/rdp/cudnn-download
diff --git a/Golden_Repo/2019a/e/EasyBuild/EasyBuild-3.9.4.eb b/Golden_Repo/2019a/e/EasyBuild/EasyBuild-3.9.4.eb
index a5005270c7a85b9290563b46029462a6c568ee45..dd3b35aa893decea27520df5add7bd16c286778d 100644
--- a/Golden_Repo/2019a/e/EasyBuild/EasyBuild-3.9.4.eb
+++ b/Golden_Repo/2019a/e/EasyBuild/EasyBuild-3.9.4.eb
@@ -8,7 +8,7 @@ description = """EasyBuild is a software build and installation framework
written in Python that allows you to install software in a structured,
repeatable and robust way."""
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = [
# vsc-install
diff --git a/Golden_Repo/2019a/f/flex/flex-2.6.4.eb b/Golden_Repo/2019a/f/flex/flex-2.6.4.eb
index cd6d58eac31d1b3c27ebf6f9a3d1924ef704fbd4..9649622b552071ff8d1af0de1e191f804feb1205 100644
--- a/Golden_Repo/2019a/f/flex/flex-2.6.4.eb
+++ b/Golden_Repo/2019a/f/flex/flex-2.6.4.eb
@@ -7,7 +7,7 @@ description = """Flex (Fast Lexical Analyzer) is a tool for generating scanners.
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'version': '', 'name': 'dummy'}
+toolchain = SYSTEM
toolchainopts = {'pic': True}
sources = [SOURCELOWER_TAR_GZ]
diff --git a/Golden_Repo/2019a/g/GCC/GCC-8.3.0.eb b/Golden_Repo/2019a/g/GCC/GCC-8.3.0.eb
index fe58612fa66dea573fc0f134ad838c6af27bd66f..1cb6f29edbbccfcbbf113467b98530c70ec60495 100644
--- a/Golden_Repo/2019a/g/GCC/GCC-8.3.0.eb
+++ b/Golden_Repo/2019a/g/GCC/GCC-8.3.0.eb
@@ -10,7 +10,7 @@ description = """The GNU Compiler Collection includes front ends for C, C++, Obj
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': ''}
+toolchain = SYSTEM
dependencies = [
('GCCcore', version),
diff --git a/Golden_Repo/2019a/g/GCCcore/GCCcore-8.3.0.eb b/Golden_Repo/2019a/g/GCCcore/GCCcore-8.3.0.eb
index 31ab42526b77662e4d4e1f0eeb85df2c0f4ea4b3..b6733887d6e29f24e2b347030b736fd112b48846 100644
--- a/Golden_Repo/2019a/g/GCCcore/GCCcore-8.3.0.eb
+++ b/Golden_Repo/2019a/g/GCCcore/GCCcore-8.3.0.eb
@@ -9,7 +9,7 @@ description = """The GNU Compiler Collection includes front ends for C, C++, Obj
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': ''}
+toolchain = SYSTEM
mpfr_version = '4.0.2'
diff --git a/Golden_Repo/2019a/g/Go/Go-1.12.6.eb b/Golden_Repo/2019a/g/Go/Go-1.12.6.eb
index 6478688e2255f2fa27f23a48d0d35c07ccffd69a..f07e9e9c0046c78f850fbf810d2c7d3db5dec772 100644
--- a/Golden_Repo/2019a/g/Go/Go-1.12.6.eb
+++ b/Golden_Repo/2019a/g/Go/Go-1.12.6.eb
@@ -9,7 +9,7 @@ description = """Go is an open source programming language that makes it easy to
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': ''}
+toolchain = SYSTEM
source_urls = ['https://storage.googleapis.com/golang/']
sources = ['%(namelower)s%(version)s.linux-amd64.tar.gz']
diff --git a/Golden_Repo/2019a/g/gcccoremkl/gcccoremkl-8.3.0-2019.3.199.eb b/Golden_Repo/2019a/g/gcccoremkl/gcccoremkl-8.3.0-2019.3.199.eb
index 70e209033450cf571a1d9dba85e9c0f42cad143e..5811b9ee2bf8a7818da646c3f8a06b26199bf45f 100644
--- a/Golden_Repo/2019a/g/gcccoremkl/gcccoremkl-8.3.0-2019.3.199.eb
+++ b/Golden_Repo/2019a/g/gcccoremkl/gcccoremkl-8.3.0-2019.3.199.eb
@@ -10,7 +10,7 @@ description = """GCCcore compiler toolchain with MKL"""
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
comp_name = 'GCCcore'
comp = (comp_name, comp_version)
diff --git a/Golden_Repo/2019a/g/gettext/gettext-0.19.8.1.eb b/Golden_Repo/2019a/g/gettext/gettext-0.19.8.1.eb
index 9e0eba5ee3d8ef23f15eea0ad6732237d3593044..cc6d03264ae6f31ea2989419ca357649dab089e4 100644
--- a/Golden_Repo/2019a/g/gettext/gettext-0.19.8.1.eb
+++ b/Golden_Repo/2019a/g/gettext/gettext-0.19.8.1.eb
@@ -16,7 +16,7 @@ site_contacts = 'sc@fz-juelich.de'
# It is the first step in the cyclic dependency chain of
# XZ -> libxml2 -> gettext -> XZ
-toolchain = {'name': 'dummy', 'version': ''}
+toolchain = SYSTEM
sources = [SOURCE_TAR_GZ]
source_urls = [GNU_SOURCE]
diff --git a/Golden_Repo/2019a/g/git-lfs/git-lfs-2.7.2.eb b/Golden_Repo/2019a/g/git-lfs/git-lfs-2.7.2.eb
index 652572b5b4555d84b42cfbaa926f6e10e5b30f79..10d3571175691a624182a63c0c6534ce4cb416d7 100644
--- a/Golden_Repo/2019a/g/git-lfs/git-lfs-2.7.2.eb
+++ b/Golden_Repo/2019a/g/git-lfs/git-lfs-2.7.2.eb
@@ -10,7 +10,7 @@ description = """Git Large File Storage (LFS) replaces large files such as audio
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': ''}
+toolchain = SYSTEM
source_urls = ['https://github.com/git-lfs/git-lfs/archive/']
sources = ['v%(version)s.tar.gz']
diff --git a/Golden_Repo/2019a/g/gmvapich2c/gmvapich2c-2019a-GDR.eb b/Golden_Repo/2019a/g/gmvapich2c/gmvapich2c-2019a-GDR.eb
index 1df76aa9776e1da38b68ecb5b39c9959173d0a19..b2ec93062068047d14a43773a6003081425a3de3 100644
--- a/Golden_Repo/2019a/g/gmvapich2c/gmvapich2c-2019a-GDR.eb
+++ b/Golden_Repo/2019a/g/gmvapich2c/gmvapich2c-2019a-GDR.eb
@@ -9,7 +9,7 @@ description = """GCC based compiler toolchain, including CUDA and MVAPICH2 for C
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
compname = 'GCC'
compver = '8.3.0'
diff --git a/Golden_Repo/2019a/g/gmvmklc/gmvmklc-2019a-GDR.eb b/Golden_Repo/2019a/g/gmvmklc/gmvmklc-2019a-GDR.eb
index b8521df40bd42934de3cca0adab2bae2e8784ec0..dc4cf36610b1fa176530d55ec94e501010679015 100644
--- a/Golden_Repo/2019a/g/gmvmklc/gmvmklc-2019a-GDR.eb
+++ b/Golden_Repo/2019a/g/gmvmklc/gmvmklc-2019a-GDR.eb
@@ -10,7 +10,7 @@ description = """ GCC based compiler toolchain,
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
comp_name = 'GCC'
comp_version = '8.3.0'
diff --git a/Golden_Repo/2019a/g/gomkl/gomkl-2019a.eb b/Golden_Repo/2019a/g/gomkl/gomkl-2019a.eb
index cb08fa4ae3edba57e0c6be05048906c9e3aa14c2..a6d62a198ab65d2246b1a64e7a94303b271a7782 100644
--- a/Golden_Repo/2019a/g/gomkl/gomkl-2019a.eb
+++ b/Golden_Repo/2019a/g/gomkl/gomkl-2019a.eb
@@ -8,7 +8,7 @@ description = """GCC and GFortran based compiler toolchain, ParaStation MPICH va
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
comp_name = 'GCC'
comp_version = '8.3.0'
diff --git a/Golden_Repo/2019a/g/gompi/gompi-2019a.eb b/Golden_Repo/2019a/g/gompi/gompi-2019a.eb
index f023e502f7cd0de1e0120e2bed0e2d3b347e791d..28b64d763a4d64c16c52f8c8df4e5097af8d41cb 100644
--- a/Golden_Repo/2019a/g/gompi/gompi-2019a.eb
+++ b/Golden_Repo/2019a/g/gompi/gompi-2019a.eb
@@ -10,7 +10,7 @@ description = """gcc and GFortran based compiler toolchain,
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
mpilib = 'OpenMPI'
mpiver = '4.0.2'
diff --git a/Golden_Repo/2019a/g/gpsmkl/gpsmkl-2019a.1.eb b/Golden_Repo/2019a/g/gpsmkl/gpsmkl-2019a.1.eb
index 781ef34b36b0365cd66c5576553ecbeb60df8f94..54bebbd1392c88add671dcdb91264dfd59710f34 100644
--- a/Golden_Repo/2019a/g/gpsmkl/gpsmkl-2019a.1.eb
+++ b/Golden_Repo/2019a/g/gpsmkl/gpsmkl-2019a.1.eb
@@ -8,7 +8,7 @@ description = """GCC and GFortran based compiler toolchain, ParaStation MPICH va
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
comp_name = 'GCC'
comp_version = '8.3.0'
diff --git a/Golden_Repo/2019a/g/gpsmkl/gpsmkl-2019a.eb b/Golden_Repo/2019a/g/gpsmkl/gpsmkl-2019a.eb
index 506a191b8bc920b8e2b7d17851b105c2450b2c37..3d41df060587bcad76b8d755b64018f227ba7cd7 100644
--- a/Golden_Repo/2019a/g/gpsmkl/gpsmkl-2019a.eb
+++ b/Golden_Repo/2019a/g/gpsmkl/gpsmkl-2019a.eb
@@ -8,7 +8,7 @@ description = """GCC and GFortran based compiler toolchain, ParaStation MPICH va
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
comp_name = 'GCC'
comp_version = '8.3.0'
diff --git a/Golden_Repo/2019a/g/gpsmpi/gpsmpi-2019a.1.eb b/Golden_Repo/2019a/g/gpsmpi/gpsmpi-2019a.1.eb
index 1b2f3fadf1b41255091917c17fe1181e7364ab85..a71edc5e5f61860bcb00bdfae48091655e8c34a1 100644
--- a/Golden_Repo/2019a/g/gpsmpi/gpsmpi-2019a.1.eb
+++ b/Golden_Repo/2019a/g/gpsmpi/gpsmpi-2019a.1.eb
@@ -10,7 +10,7 @@ description = """gcc and GFortran based compiler toolchain,
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
mpilib = 'psmpi'
mpiver = '5.4.3-1'
diff --git a/Golden_Repo/2019a/g/gpsmpi/gpsmpi-2019a.eb b/Golden_Repo/2019a/g/gpsmpi/gpsmpi-2019a.eb
index 66a9d1252af99971893300e011be8267ab371e9a..92641b4c680a117ff3fba9a8e82b522e60de9c24 100644
--- a/Golden_Repo/2019a/g/gpsmpi/gpsmpi-2019a.eb
+++ b/Golden_Repo/2019a/g/gpsmpi/gpsmpi-2019a.eb
@@ -10,7 +10,7 @@ description = """gcc and GFortran based compiler toolchain,
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
mpilib = 'psmpi'
mpiver = '5.2.2-1'
diff --git a/Golden_Repo/2019a/h/HDFView/HDFView-2.14.eb b/Golden_Repo/2019a/h/HDFView/HDFView-2.14.eb
index f6658d8c5c12a41321d8b829f66ce5c239af3d1f..018f2307f848aae697601688c02aa51730a2c38a 100644
--- a/Golden_Repo/2019a/h/HDFView/HDFView-2.14.eb
+++ b/Golden_Repo/2019a/h/HDFView/HDFView-2.14.eb
@@ -8,7 +8,7 @@ description = "HDFView is a visual tool for browsing and editing HDF4 and HDF5 f
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': ''}
+toolchain = SYSTEM
source_urls = ['https://support.hdfgroup.org/ftp/HDF5/hdf-java/current/bin/']
sources = ['%(name)s-%(version)s-centos7_64.tar.gz']
diff --git a/Golden_Repo/2019a/i/Inspector/Inspector-2019_update3.eb b/Golden_Repo/2019a/i/Inspector/Inspector-2019_update3.eb
index f9b2687f9b9077586d388576870ee5e4ecef284e..2244444bf0471bdd51908351f86c0110909e2532 100644
--- a/Golden_Repo/2019a/i/Inspector/Inspector-2019_update3.eb
+++ b/Golden_Repo/2019a/i/Inspector/Inspector-2019_update3.eb
@@ -7,7 +7,7 @@ applications """
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name':'dummy','version':'dummy'}
+toolchain = SYSTEM
sources = ['inspector_%(version)s.tar.gz']
diff --git a/Golden_Repo/2019a/i/Inspector/Inspector-2019_update5.eb b/Golden_Repo/2019a/i/Inspector/Inspector-2019_update5.eb
index 7e9422296792c6551f942beabf416814e324393f..e8e127abcc9e17b286d352aeea5f866805801b9c 100644
--- a/Golden_Repo/2019a/i/Inspector/Inspector-2019_update5.eb
+++ b/Golden_Repo/2019a/i/Inspector/Inspector-2019_update5.eb
@@ -7,7 +7,7 @@ applications """
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name':'dummy','version':'dummy'}
+toolchain = SYSTEM
sources = ['inspector_%(version)s.tar.gz']
diff --git a/Golden_Repo/2019a/i/icc/icc-2019.3.199-GCC-8.3.0.eb b/Golden_Repo/2019a/i/icc/icc-2019.3.199-GCC-8.3.0.eb
index ff51d0dbf4ca9c53fd6e5648c52d9282e0e29410..7618c25cc7ebc9ee729b0f7f510b91b4f6527069 100644
--- a/Golden_Repo/2019a/i/icc/icc-2019.3.199-GCC-8.3.0.eb
+++ b/Golden_Repo/2019a/i/icc/icc-2019.3.199-GCC-8.3.0.eb
@@ -9,7 +9,7 @@ description = """C and C++ compiler from Intel
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
sources = ['parallel_studio_xe_%(version_major)s_update%(version_minor)s_composer_edition_for_cpp.tgz']
#sources = ['parallel_studio_xe_%(version_major)s_composer_edition_for_cpp.tgz']
diff --git a/Golden_Repo/2019a/i/icc/icc-2019.5.281-GCC-8.3.0.eb b/Golden_Repo/2019a/i/icc/icc-2019.5.281-GCC-8.3.0.eb
index fe24d08679bf09c3618f982a469059cd5afb98bf..6c4bea5493311253c27d15443c93a2ed595507b7 100644
--- a/Golden_Repo/2019a/i/icc/icc-2019.5.281-GCC-8.3.0.eb
+++ b/Golden_Repo/2019a/i/icc/icc-2019.5.281-GCC-8.3.0.eb
@@ -9,7 +9,7 @@ description = """C and C++ compiler from Intel
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
sources = ['parallel_studio_xe_%(version_major)s_update%(version_minor)s_composer_edition_for_cpp.tgz']
#sources = ['parallel_studio_xe_%(version_major)s_composer_edition_for_cpp.tgz']
diff --git a/Golden_Repo/2019a/i/iccifort/iccifort-2019.3.199-GCC-8.3.0.eb b/Golden_Repo/2019a/i/iccifort/iccifort-2019.3.199-GCC-8.3.0.eb
index 696e5e73eba3b9bc5d739195d73d31634321f179..ac2f483e5836e134bda27483939ff48102608ab6 100644
--- a/Golden_Repo/2019a/i/iccifort/iccifort-2019.3.199-GCC-8.3.0.eb
+++ b/Golden_Repo/2019a/i/iccifort/iccifort-2019.3.199-GCC-8.3.0.eb
@@ -10,7 +10,7 @@ description = """Intel Cluster Toolkit Compiler Edition provides Intel C,C++ and
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
dependencies = [
('icc', version, versionsuffix),
diff --git a/Golden_Repo/2019a/i/iccifort/iccifort-2019.5.281-GCC-8.3.0.eb b/Golden_Repo/2019a/i/iccifort/iccifort-2019.5.281-GCC-8.3.0.eb
index 12f5371d65b4b356b1e960b989626bbe6ddbaa64..82d52dec550cb6cc7f17ea39b7d247d9170c84ac 100644
--- a/Golden_Repo/2019a/i/iccifort/iccifort-2019.5.281-GCC-8.3.0.eb
+++ b/Golden_Repo/2019a/i/iccifort/iccifort-2019.5.281-GCC-8.3.0.eb
@@ -10,7 +10,7 @@ description = """Intel Cluster Toolkit Compiler Edition provides Intel C,C++ and
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
dependencies = [
('icc', version, versionsuffix),
diff --git a/Golden_Repo/2019a/i/ifort/ifort-2019.3.199-GCC-8.3.0.eb b/Golden_Repo/2019a/i/ifort/ifort-2019.3.199-GCC-8.3.0.eb
index 10932addebf8438ac301609d802e68a64adf2937..39c0f1380a434177cc78438ca4c3d0a664594f19 100644
--- a/Golden_Repo/2019a/i/ifort/ifort-2019.3.199-GCC-8.3.0.eb
+++ b/Golden_Repo/2019a/i/ifort/ifort-2019.3.199-GCC-8.3.0.eb
@@ -7,7 +7,7 @@ description = """Fortran compiler from Intel
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
#sources = ['parallel_studio_xe_%(version_major)s_composer_edition_for_fortran.tgz']
sources = ['parallel_studio_xe_%(version_major)s_update%(version_minor)s_composer_edition_for_fortran.tgz']
diff --git a/Golden_Repo/2019a/i/ifort/ifort-2019.5.281-GCC-8.3.0.eb b/Golden_Repo/2019a/i/ifort/ifort-2019.5.281-GCC-8.3.0.eb
index 943172a9303f4570a8cc4f9a746a8159d7331855..169a370f58f5f07b1896d7c0e42f05113ff96bea 100644
--- a/Golden_Repo/2019a/i/ifort/ifort-2019.5.281-GCC-8.3.0.eb
+++ b/Golden_Repo/2019a/i/ifort/ifort-2019.5.281-GCC-8.3.0.eb
@@ -7,7 +7,7 @@ description = """Fortran compiler from Intel
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
#sources = ['parallel_studio_xe_%(version_major)s_composer_edition_for_fortran.tgz']
sources = ['parallel_studio_xe_%(version_major)s_update%(version_minor)s_composer_edition_for_fortran.tgz']
diff --git a/Golden_Repo/2019a/i/iimpi/iimpi-2019a.1.eb b/Golden_Repo/2019a/i/iimpi/iimpi-2019a.1.eb
index c5cfa59d5df0a68e991d39c4ad3e0054383d057e..6d7af5830c2e9f99bd92a3d3becdcaf38b7013e9 100644
--- a/Golden_Repo/2019a/i/iimpi/iimpi-2019a.1.eb
+++ b/Golden_Repo/2019a/i/iimpi/iimpi-2019a.1.eb
@@ -9,7 +9,7 @@ description = """Intel C/C++ and Fortran compilers, alongside Intel MPI.
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
compver = '2019.3.199'
gccsuffix = '-GCC-8.3.0'
diff --git a/Golden_Repo/2019a/i/iimpi/iimpi-2019a.eb b/Golden_Repo/2019a/i/iimpi/iimpi-2019a.eb
index 8ddf00c6a63c711e2907ce066f221db25f4088da..7944204f85fa968275ba718b3642aff86a75085b 100644
--- a/Golden_Repo/2019a/i/iimpi/iimpi-2019a.eb
+++ b/Golden_Repo/2019a/i/iimpi/iimpi-2019a.eb
@@ -9,7 +9,7 @@ description = """Intel C/C++ and Fortran compilers, alongside Intel MPI.
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
compver = '2019.3.199'
gccsuffix = '-GCC-8.3.0'
diff --git a/Golden_Repo/2019a/i/imkl/imkl-2019.3.199.eb b/Golden_Repo/2019a/i/imkl/imkl-2019.3.199.eb
index 53747b002c5ffbd4a190c67064bf3028e0d70b93..b94ae96941390c1bf1e4716c90f5b26a393654a9 100644
--- a/Golden_Repo/2019a/i/imkl/imkl-2019.3.199.eb
+++ b/Golden_Repo/2019a/i/imkl/imkl-2019.3.199.eb
@@ -10,7 +10,7 @@ description = """Intel Math Kernel Library is a library of highly optimized,
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'version': 'dummy', 'name': 'dummy'}
+toolchain = SYSTEM
sources = ['l_mkl_%(version)s.tgz']
diff --git a/Golden_Repo/2019a/i/impi-settings/impi-settings-2019-UCX-UD.eb b/Golden_Repo/2019a/i/impi-settings/impi-settings-2019-UCX-UD.eb
index ebdd41c02ff9a7e23a292648c46f63a1d22a0a34..2f352fde562f6fa3ca191ce02b0a33b65c98506c 100644
--- a/Golden_Repo/2019a/i/impi-settings/impi-settings-2019-UCX-UD.eb
+++ b/Golden_Repo/2019a/i/impi-settings/impi-settings-2019-UCX-UD.eb
@@ -9,7 +9,7 @@ description = """This is a module to load the IntelMPI configuration with UCX an
site_contacts = 'd.alvarez@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = []
diff --git a/Golden_Repo/2019a/i/impi-settings/impi-settings-2019-default.eb b/Golden_Repo/2019a/i/impi-settings/impi-settings-2019-default.eb
index 62fe65bd87cc2390875ed0e7aa3faec4bfe631fc..aed1355c8cfdf3ce68f674eef924b3e53c0bb261 100644
--- a/Golden_Repo/2019a/i/impi-settings/impi-settings-2019-default.eb
+++ b/Golden_Repo/2019a/i/impi-settings/impi-settings-2019-default.eb
@@ -9,7 +9,7 @@ description = """This is a module to load the default IntelMPI configuration"""
site_contacts = 'd.alvarez@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = []
diff --git a/Golden_Repo/2019a/i/impi-settings/impi-settings-2019-large-job-hybrid.eb b/Golden_Repo/2019a/i/impi-settings/impi-settings-2019-large-job-hybrid.eb
index d1ec28953280e5f81b7fbd88c1547a982f7e402f..c8565ebfdec4ef393da63b0571aeb4569504f31a 100644
--- a/Golden_Repo/2019a/i/impi-settings/impi-settings-2019-large-job-hybrid.eb
+++ b/Golden_Repo/2019a/i/impi-settings/impi-settings-2019-large-job-hybrid.eb
@@ -9,7 +9,7 @@ description = """This is a module to load the IntelMPI configuration for large s
site_contacts = 'd.alvarez@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = []
diff --git a/Golden_Repo/2019a/i/impi-settings/impi-settings-2019-large-job-mpi.eb b/Golden_Repo/2019a/i/impi-settings/impi-settings-2019-large-job-mpi.eb
index 03fb0c375afa07e0b59811f2481d54e7b333e65e..5b8ad67bbb926ba3279b356fab4befcad25efe9f 100644
--- a/Golden_Repo/2019a/i/impi-settings/impi-settings-2019-large-job-mpi.eb
+++ b/Golden_Repo/2019a/i/impi-settings/impi-settings-2019-large-job-mpi.eb
@@ -9,7 +9,7 @@ description = """This is a module to load the IntelMPI configuration for large s
site_contacts = 'd.alvarez@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = []
diff --git a/Golden_Repo/2019a/i/intel-para/intel-para-2019a-mt.eb b/Golden_Repo/2019a/i/intel-para/intel-para-2019a-mt.eb
index 7b8d5209d9713cfb1efac431b8956af57f13c071..5cd5031f3e0fb6d3b2202370fcfc7adb5a5cc335 100644
--- a/Golden_Repo/2019a/i/intel-para/intel-para-2019a-mt.eb
+++ b/Golden_Repo/2019a/i/intel-para/intel-para-2019a-mt.eb
@@ -13,7 +13,7 @@ description = """intel-para provides Intel C/C++ and Fortran compilers, ParaStat
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'version': '', 'name': 'dummy'}
+toolchain = SYSTEM
dependencies = [
('iccifort', intelversion, intelsuffix),
diff --git a/Golden_Repo/2019a/i/intel-para/intel-para-2019a.1-mt.eb b/Golden_Repo/2019a/i/intel-para/intel-para-2019a.1-mt.eb
index 2fe953938b028c561b7126d2a587b9f245a0ca21..84807e8f24370a841befdfaf79eef14e53cd43a6 100644
--- a/Golden_Repo/2019a/i/intel-para/intel-para-2019a.1-mt.eb
+++ b/Golden_Repo/2019a/i/intel-para/intel-para-2019a.1-mt.eb
@@ -13,7 +13,7 @@ description = """intel-para provides Intel C/C++ and Fortran compilers, ParaStat
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'version': '', 'name': 'dummy'}
+toolchain = SYSTEM
dependencies = [
('iccifort', intelversion, intelsuffix),
diff --git a/Golden_Repo/2019a/i/intel-para/intel-para-2019a.1.eb b/Golden_Repo/2019a/i/intel-para/intel-para-2019a.1.eb
index c98b2272ba4a94748fd68e0dc7a72381df731a7a..7fef0495d061bc8dc728704abb1d8bd04906bfc3 100644
--- a/Golden_Repo/2019a/i/intel-para/intel-para-2019a.1.eb
+++ b/Golden_Repo/2019a/i/intel-para/intel-para-2019a.1.eb
@@ -13,7 +13,7 @@ description = """intel-para provides Intel C/C++ and Fortran compilers, ParaStat
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'version': '', 'name': 'dummy'}
+toolchain = SYSTEM
dependencies = [
('iccifort', intelversion, intelsuffix),
diff --git a/Golden_Repo/2019a/i/intel-para/intel-para-2019a.eb b/Golden_Repo/2019a/i/intel-para/intel-para-2019a.eb
index f3bea54f9fc3ba523da68adfef38109dce522a27..9b72bb4352b438a8019f023fdf008527022dc416 100644
--- a/Golden_Repo/2019a/i/intel-para/intel-para-2019a.eb
+++ b/Golden_Repo/2019a/i/intel-para/intel-para-2019a.eb
@@ -13,7 +13,7 @@ description = """intel-para provides Intel C/C++ and Fortran compilers, ParaStat
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'version': '', 'name': 'dummy'}
+toolchain = SYSTEM
dependencies = [
('iccifort', intelversion, intelsuffix),
diff --git a/Golden_Repo/2019a/i/intel/intel-2019a.1.eb b/Golden_Repo/2019a/i/intel/intel-2019a.1.eb
index f918b3a7d5d3f67ddc5f97dd5f1d13692c6d719e..2ccf1f4f85d949784afb64225e0d092e2367138d 100644
--- a/Golden_Repo/2019a/i/intel/intel-2019a.1.eb
+++ b/Golden_Repo/2019a/i/intel/intel-2019a.1.eb
@@ -9,7 +9,7 @@ description = """Intel Cluster Toolkit Compiler Edition provides Intel C/C++ and
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'version': '', 'name': 'dummy'}
+toolchain = SYSTEM
dependencies = [
('iccifort', '2019.3.199', '-GCC-8.3.0'),
diff --git a/Golden_Repo/2019a/i/intel/intel-2019a.eb b/Golden_Repo/2019a/i/intel/intel-2019a.eb
index 91517c985e307e838f7d4daa5b72f468166fa60f..c90bd56c261f40901daca2bb3f3564de0cd1150c 100644
--- a/Golden_Repo/2019a/i/intel/intel-2019a.eb
+++ b/Golden_Repo/2019a/i/intel/intel-2019a.eb
@@ -9,7 +9,7 @@ description = """Intel Cluster Toolkit Compiler Edition provides Intel C/C++ and
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'version': '', 'name': 'dummy'}
+toolchain = SYSTEM
dependencies = [
('iccifort', '2019.3.199', '-GCC-8.3.0'),
diff --git a/Golden_Repo/2019a/i/iomkl/iomkl-2019a.eb b/Golden_Repo/2019a/i/iomkl/iomkl-2019a.eb
index 92c14e758766ca7c52a54bfef9d632e9346bd429..2e1bf264d4e82fac27ce2f91cf04b6b8be6d657b 100644
--- a/Golden_Repo/2019a/i/iomkl/iomkl-2019a.eb
+++ b/Golden_Repo/2019a/i/iomkl/iomkl-2019a.eb
@@ -14,7 +14,7 @@ description = """iomkl provides Intel C/C++ and Fortran compilers, ParaStationMP
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'version': '', 'name': 'dummy'}
+toolchain = SYSTEM
dependencies = [
('iccifort', intelversion, intelsuffix),
diff --git a/Golden_Repo/2019a/i/iompi/iompi-2019a.eb b/Golden_Repo/2019a/i/iompi/iompi-2019a.eb
index 4d83f58c02ac08261eded3ea1172c9a217b8ca7d..a954ddfa92e15f2b4df8f4657a32ab63ee90593f 100644
--- a/Golden_Repo/2019a/i/iompi/iompi-2019a.eb
+++ b/Golden_Repo/2019a/i/iompi/iompi-2019a.eb
@@ -9,7 +9,7 @@ description = """Intel C/C++ and Fortran compilers, alongside ParaStationMPI.
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
compver = '2019.5.281'
gccsuffix = '-GCC-8.3.0'
diff --git a/Golden_Repo/2019a/i/ipp/ipp-2019.3.199.eb b/Golden_Repo/2019a/i/ipp/ipp-2019.3.199.eb
index 7c3ec5445e5d676e88ca7ea5e9bccf2741b91e45..8bded803f391006d7e1da98016c1a014e37e28c5 100644
--- a/Golden_Repo/2019a/i/ipp/ipp-2019.3.199.eb
+++ b/Golden_Repo/2019a/i/ipp/ipp-2019.3.199.eb
@@ -10,7 +10,7 @@ description = """Intel Integrated Performance Primitives (Intel IPP) is an exten
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
sources = ['l_ipp_%(version)s.tgz']
diff --git a/Golden_Repo/2019a/i/ipp/ipp-2019.5.281.eb b/Golden_Repo/2019a/i/ipp/ipp-2019.5.281.eb
index 460a59b9b5ad88da284ef7636582e2e6f663d520..8da19d35431d6b81c738138a46e8a8e74a8d993f 100644
--- a/Golden_Repo/2019a/i/ipp/ipp-2019.5.281.eb
+++ b/Golden_Repo/2019a/i/ipp/ipp-2019.5.281.eb
@@ -10,7 +10,7 @@ description = """Intel Integrated Performance Primitives (Intel IPP) is an exten
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
sources = ['l_ipp_%(version)s.tgz']
diff --git a/Golden_Repo/2019a/i/ipsmpi/ipsmpi-2019a-mt.eb b/Golden_Repo/2019a/i/ipsmpi/ipsmpi-2019a-mt.eb
index 9e5115001d34b0decd25fa411a3865a9be086aa9..4bd80ee60a9ff196c26f158dcaa82e3f62ce7a3e 100644
--- a/Golden_Repo/2019a/i/ipsmpi/ipsmpi-2019a-mt.eb
+++ b/Golden_Repo/2019a/i/ipsmpi/ipsmpi-2019a-mt.eb
@@ -10,7 +10,7 @@ description = """Intel C/C++ and Fortran compilers, alongside ParaStationMPI.
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
compver = '2019.3.199'
gccsuffix = '-GCC-8.3.0'
diff --git a/Golden_Repo/2019a/i/ipsmpi/ipsmpi-2019a.1-mt.eb b/Golden_Repo/2019a/i/ipsmpi/ipsmpi-2019a.1-mt.eb
index 8992f0b523c08c5fc6e3f98b9a1051a1ff4212a2..5965dbb8753bde2af3805181af0d4f09be0daa13 100644
--- a/Golden_Repo/2019a/i/ipsmpi/ipsmpi-2019a.1-mt.eb
+++ b/Golden_Repo/2019a/i/ipsmpi/ipsmpi-2019a.1-mt.eb
@@ -10,7 +10,7 @@ description = """Intel C/C++ and Fortran compilers, alongside ParaStationMPI.
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
compver = '2019.5.281'
gccsuffix = '-GCC-8.3.0'
diff --git a/Golden_Repo/2019a/i/ipsmpi/ipsmpi-2019a.1.eb b/Golden_Repo/2019a/i/ipsmpi/ipsmpi-2019a.1.eb
index 395ef96a88324058c840a565517e83bd6f1e446a..01b3eb81e680284cfc8c900bc8f5a7b236604cff 100644
--- a/Golden_Repo/2019a/i/ipsmpi/ipsmpi-2019a.1.eb
+++ b/Golden_Repo/2019a/i/ipsmpi/ipsmpi-2019a.1.eb
@@ -9,7 +9,7 @@ description = """Intel C/C++ and Fortran compilers, alongside ParaStationMPI.
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
compver = '2019.5.281'
gccsuffix = '-GCC-8.3.0'
diff --git a/Golden_Repo/2019a/i/ipsmpi/ipsmpi-2019a.eb b/Golden_Repo/2019a/i/ipsmpi/ipsmpi-2019a.eb
index 9f8ac0f1bb864d97777814aa0d23f9cf9bd9db8e..914ef929bfe5e99252d7a9cc3d945542058976d2 100644
--- a/Golden_Repo/2019a/i/ipsmpi/ipsmpi-2019a.eb
+++ b/Golden_Repo/2019a/i/ipsmpi/ipsmpi-2019a.eb
@@ -9,7 +9,7 @@ description = """Intel C/C++ and Fortran compilers, alongside ParaStationMPI.
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
compver = '2019.3.199'
gccsuffix = '-GCC-8.3.0'
diff --git a/Golden_Repo/2019a/i/ispc/ispc-1.10.0.eb b/Golden_Repo/2019a/i/ispc/ispc-1.10.0.eb
index 75bfb5e2e54dc5074ebc69c710ec223b06e3529e..cf78504f61d14cdd5c4a991b3110a9ab90adb148 100644
--- a/Golden_Repo/2019a/i/ispc/ispc-1.10.0.eb
+++ b/Golden_Repo/2019a/i/ispc/ispc-1.10.0.eb
@@ -14,7 +14,7 @@ description = """Intel SPMD Program Compilers; An open-source compiler for high-
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
sources = ['ispc-v%(version)s-linux.tar.gz']
source_urls = [('http://sourceforge.net/projects/ispcmirror/files/v%(version)s', 'download')]
diff --git a/Golden_Repo/2019a/i/itac/itac-2019.3.032.eb b/Golden_Repo/2019a/i/itac/itac-2019.3.032.eb
index 4268e40db2f1266c0d65216f0c6026575a5697e9..94747a3f10d98194a393f0b5ef594f1a604adf21 100644
--- a/Golden_Repo/2019a/i/itac/itac-2019.3.032.eb
+++ b/Golden_Repo/2019a/i/itac/itac-2019.3.032.eb
@@ -25,7 +25,7 @@ usage = """
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
sources = ['l_itac_p_%(version)s.tgz']
diff --git a/Golden_Repo/2019a/i/itac/itac-2019.5.041.eb b/Golden_Repo/2019a/i/itac/itac-2019.5.041.eb
index 4464307f380c0b89a1ac905e660e5e9862e9ec7a..fd1493f40c4242a637210c81398af628e6ff874e 100644
--- a/Golden_Repo/2019a/i/itac/itac-2019.5.041.eb
+++ b/Golden_Repo/2019a/i/itac/itac-2019.5.041.eb
@@ -25,7 +25,7 @@ usage = """
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
sources = ['l_itac_p_%(version)s.tgz']
diff --git a/Golden_Repo/2019a/j/JUBE/JUBE-2.2.2.eb b/Golden_Repo/2019a/j/JUBE/JUBE-2.2.2.eb
index 63448dfa2dd38aa44fbc98db2b0b211c582620d6..207377a16ac3a1e846247375a68fb11f26b92348 100644
--- a/Golden_Repo/2019a/j/JUBE/JUBE-2.2.2.eb
+++ b/Golden_Repo/2019a/j/JUBE/JUBE-2.2.2.eb
@@ -10,7 +10,7 @@ run those sets on different computer systems and evaluate the results.
site_contacts = 's.luehrs@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = ['http://apps.fz-juelich.de/jsc/jube/jube2/download.php?file=']
sources = [SOURCE_TAR_GZ]
diff --git a/Golden_Repo/2019a/j/JUnit/JUnit-4.12.eb b/Golden_Repo/2019a/j/JUnit/JUnit-4.12.eb
index 5840c3419ea6cd69cf728328318a906f180cf936..605a8e15ab8a693e0961e8a93babd5710ac12762 100644
--- a/Golden_Repo/2019a/j/JUnit/JUnit-4.12.eb
+++ b/Golden_Repo/2019a/j/JUnit/JUnit-4.12.eb
@@ -8,7 +8,7 @@ description = """A programmer-oriented testing framework for Java."""
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': ''}
+toolchain = SYSTEM
sources = ['%(namelower)s-%(version)s.jar']
source_urls = ['http://search.maven.org/remotecontent?filepath=junit/junit/%(version)s/']
diff --git a/Golden_Repo/2019a/j/Java/Java-1.8.eb b/Golden_Repo/2019a/j/Java/Java-1.8.eb
index 59e301b0645bab3460fe242c5536545ac57b12da..338c5a7a2fd7b3dd0dfe09971edcacda2d0e75f6 100644
--- a/Golden_Repo/2019a/j/Java/Java-1.8.eb
+++ b/Golden_Repo/2019a/j/Java/Java-1.8.eb
@@ -8,7 +8,7 @@ description = """Java Platform, Standard Edition (Java SE) lets you develop and
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
# download the tar.gz directly from http://www.oracle.com/technetwork/java/javase/downloads/index.html
(vp, vs) = realversion.split('_')
diff --git a/Golden_Repo/2019a/jusuf_overlay/i/iimpi/iimpi-2019a.eb b/Golden_Repo/2019a/jusuf_overlay/i/iimpi/iimpi-2019a.eb
index 2a738cfb2b410c8ec59223390500cca6f7c9f23e..8270157de411d14c7ae8d728574be634163e00ca 100644
--- a/Golden_Repo/2019a/jusuf_overlay/i/iimpi/iimpi-2019a.eb
+++ b/Golden_Repo/2019a/jusuf_overlay/i/iimpi/iimpi-2019a.eb
@@ -9,7 +9,7 @@ description = """Intel C/C++ and Fortran compilers, alongside Intel MPI.
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
compver = '2019.5.281'
mpiver = '2019.6.154'
diff --git a/Golden_Repo/2019a/jusuf_overlay/i/imkl/imkl-2019.5.281.eb b/Golden_Repo/2019a/jusuf_overlay/i/imkl/imkl-2019.5.281.eb
index f8a9289af5ad53ddf47b971c25256d3c5ae142c7..97d3aa720131a290c555480c0df80d96d8528249 100644
--- a/Golden_Repo/2019a/jusuf_overlay/i/imkl/imkl-2019.5.281.eb
+++ b/Golden_Repo/2019a/jusuf_overlay/i/imkl/imkl-2019.5.281.eb
@@ -10,7 +10,7 @@ description = """Intel Math Kernel Library is a library of highly optimized,
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'version': 'dummy', 'name': 'dummy'}
+toolchain = SYSTEM
sources = ['l_mkl_%(version)s.tgz']
diff --git a/Golden_Repo/2019a/jusuf_overlay/i/intel-para/intel-para-2019a-mt.eb b/Golden_Repo/2019a/jusuf_overlay/i/intel-para/intel-para-2019a-mt.eb
index 932ac1ae3f63699dd14620d2d4a04b78f8ce24e5..7f51837902e068c290ccd67fa2d85e72fb34c438 100644
--- a/Golden_Repo/2019a/jusuf_overlay/i/intel-para/intel-para-2019a-mt.eb
+++ b/Golden_Repo/2019a/jusuf_overlay/i/intel-para/intel-para-2019a-mt.eb
@@ -13,7 +13,7 @@ description = """intel-para provides Intel C/C++ and Fortran compilers, ParaStat
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'version': '', 'name': 'dummy'}
+toolchain = SYSTEM
dependencies = [
('iccifort', intelversion, intelsuffix),
diff --git a/Golden_Repo/2019a/jusuf_overlay/i/intel-para/intel-para-2019a.eb b/Golden_Repo/2019a/jusuf_overlay/i/intel-para/intel-para-2019a.eb
index e7acc57d3f00f17fa2f1f60b752f91d6b9576e83..e6415cbb677b64c51da89c469959a482663b92eb 100644
--- a/Golden_Repo/2019a/jusuf_overlay/i/intel-para/intel-para-2019a.eb
+++ b/Golden_Repo/2019a/jusuf_overlay/i/intel-para/intel-para-2019a.eb
@@ -13,7 +13,7 @@ description = """intel-para provides Intel C/C++ and Fortran compilers, ParaStat
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'version': '', 'name': 'dummy'}
+toolchain = SYSTEM
dependencies = [
('iccifort', intelversion, intelsuffix),
diff --git a/Golden_Repo/2019a/jusuf_overlay/i/ipsmpi/ipsmpi-2019a-mt.eb b/Golden_Repo/2019a/jusuf_overlay/i/ipsmpi/ipsmpi-2019a-mt.eb
index 9ffceee5e03755c40afc8093357db7f5233344e8..aa83406778fab195fadb7a34f6a381b090b83b6b 100644
--- a/Golden_Repo/2019a/jusuf_overlay/i/ipsmpi/ipsmpi-2019a-mt.eb
+++ b/Golden_Repo/2019a/jusuf_overlay/i/ipsmpi/ipsmpi-2019a-mt.eb
@@ -10,7 +10,7 @@ description = """Intel C/C++ and Fortran compilers, alongside ParaStationMPI.
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
compver = '2019.5.281'
gccsuffix = '-GCC-8.3.0'
diff --git a/Golden_Repo/2019a/jusuf_overlay/i/ipsmpi/ipsmpi-2019a.eb b/Golden_Repo/2019a/jusuf_overlay/i/ipsmpi/ipsmpi-2019a.eb
index 8b10078018677a7aef9342503dea4d3cb775db98..0af58ba1539082faefa3b44d4de5df0e0e0c7730 100644
--- a/Golden_Repo/2019a/jusuf_overlay/i/ipsmpi/ipsmpi-2019a.eb
+++ b/Golden_Repo/2019a/jusuf_overlay/i/ipsmpi/ipsmpi-2019a.eb
@@ -9,7 +9,7 @@ description = """Intel C/C++ and Fortran compilers, alongside ParaStationMPI.
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
compver = '2019.5.281'
gccsuffix = '-GCC-8.3.0'
diff --git a/Golden_Repo/2019a/jusuf_overlay/j/JUBE/JUBE-2.3.0.eb b/Golden_Repo/2019a/jusuf_overlay/j/JUBE/JUBE-2.3.0.eb
index dc757b4d9cf63e703ce541a090b25cf4c2948e81..a06c26c8002397780b3310c399af469530f9b54b 100644
--- a/Golden_Repo/2019a/jusuf_overlay/j/JUBE/JUBE-2.3.0.eb
+++ b/Golden_Repo/2019a/jusuf_overlay/j/JUBE/JUBE-2.3.0.eb
@@ -10,7 +10,7 @@ run those sets on different computer systems and evaluate the results.
site_contacts = 's.luehrs@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = ['http://apps.fz-juelich.de/jsc/jube/jube2/download.php?file=']
sources = [SOURCE_TAR_GZ]
diff --git a/Golden_Repo/2019a/jusuf_overlay/n/nvidia/nvidia-driver.eb b/Golden_Repo/2019a/jusuf_overlay/n/nvidia/nvidia-driver.eb
index 8da09561ce452d73aa0d8d028a939a7e9f36d1c5..6de9c8f3b6e2727cc56a154a95b2f59236bf0eab 100644
--- a/Golden_Repo/2019a/jusuf_overlay/n/nvidia/nvidia-driver.eb
+++ b/Golden_Repo/2019a/jusuf_overlay/n/nvidia/nvidia-driver.eb
@@ -7,7 +7,7 @@ description = """This is a set of libraries normally installed by the NVIDIA dri
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = [
'http://us.download.nvidia.com/tesla/%s/' % realversion,
diff --git a/Golden_Repo/2019a/juwels_overlay/a/ARMForge/ARMForge-19.0.4.eb b/Golden_Repo/2019a/juwels_overlay/a/ARMForge/ARMForge-19.0.4.eb
index cf34d3d6cbd271e1ba2ab1d1a3da4861e3bd4a81..d201701f8a283dcc64e9a56a49ed4c3b49901aba 100644
--- a/Golden_Repo/2019a/juwels_overlay/a/ARMForge/ARMForge-19.0.4.eb
+++ b/Golden_Repo/2019a/juwels_overlay/a/ARMForge/ARMForge-19.0.4.eb
@@ -17,7 +17,7 @@ For the ARM DDT and MAP User Guide, please see: "$EBROOTARMFORGE/doc/userguide.p
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'version': 'dummy', 'name': 'dummy'}
+toolchain = SYSTEM
sources = ['arm-forge-%(version)s-Redhat-7.0-x86_64.tar']
#http://content.allinea.com/downloads/allinea-tools-4.2-PR-39422-Redhat-6.0-x86_64.tar
diff --git a/Golden_Repo/2019a/juwels_overlay/a/ARMPerformanceReports/ARMPerformanceReports-19.0.4.eb b/Golden_Repo/2019a/juwels_overlay/a/ARMPerformanceReports/ARMPerformanceReports-19.0.4.eb
index 3e2e8e04e67112a37d781ed238488a3bcc4964d8..d3a3004048d375ed9f8158d771b45cd2ce49f12f 100644
--- a/Golden_Repo/2019a/juwels_overlay/a/ARMPerformanceReports/ARMPerformanceReports-19.0.4.eb
+++ b/Golden_Repo/2019a/juwels_overlay/a/ARMPerformanceReports/ARMPerformanceReports-19.0.4.eb
@@ -20,7 +20,7 @@ will be created in the current directory on completion.
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'version': 'dummy', 'name': 'dummy'}
+toolchain = SYSTEM
sources = ['arm-reports-%(version)s-Redhat-7.0-x86_64.tar']
source_urls = ['http://content.allinea.com/downloads/']
diff --git a/Golden_Repo/2019a/juwels_overlay/p/pmvmklc/pmvmklc-2019a-GDR.eb b/Golden_Repo/2019a/juwels_overlay/p/pmvmklc/pmvmklc-2019a-GDR.eb
index 325b808778f5df2a9692495b303b58c5d8729c8f..2cf1a3dadfb0ba783ccb09531a7bbd9c746b6c1f 100644
--- a/Golden_Repo/2019a/juwels_overlay/p/pmvmklc/pmvmklc-2019a-GDR.eb
+++ b/Golden_Repo/2019a/juwels_overlay/p/pmvmklc/pmvmklc-2019a-GDR.eb
@@ -10,7 +10,7 @@ description = """ PGI based compiler toolchain,
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
comp_name = 'PGI'
comp_version = '19.3-GCC-8.3.0'
diff --git a/Golden_Repo/2019a/juwels_overlay/v/Vampir/Vampir-9.6.1.eb b/Golden_Repo/2019a/juwels_overlay/v/Vampir/Vampir-9.6.1.eb
index 9d13fc848a9afe0ff9c3de9be1a8c4e5a578319a..e4b50646d78765d7ca425571561efabcc3b9eb15 100644
--- a/Golden_Repo/2019a/juwels_overlay/v/Vampir/Vampir-9.6.1.eb
+++ b/Golden_Repo/2019a/juwels_overlay/v/Vampir/Vampir-9.6.1.eb
@@ -21,7 +21,7 @@ description = """The VAMPIR software tool provides an easy-to-use framework that
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
sources = ['vampir-%s%s-setup.bin' % (version, archsuffix)]
diff --git a/Golden_Repo/2019a/knl_overlay/i/impi-settings/impi-settings-2019-default.eb b/Golden_Repo/2019a/knl_overlay/i/impi-settings/impi-settings-2019-default.eb
index 57c502e7026c228081cdd915b611127a98980b8f..300344b466b19167f1d7641fd23ed38d57dc77fd 100644
--- a/Golden_Repo/2019a/knl_overlay/i/impi-settings/impi-settings-2019-default.eb
+++ b/Golden_Repo/2019a/knl_overlay/i/impi-settings/impi-settings-2019-default.eb
@@ -9,7 +9,7 @@ description = """This is a module to load the default IntelMPI configuration"""
site_contacts = 'd.alvarez@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = []
diff --git a/Golden_Repo/2019a/knl_overlay/l/libfabric/libfabric-1.9.0.eb b/Golden_Repo/2019a/knl_overlay/l/libfabric/libfabric-1.9.0.eb
index f739f3c3e92528dddbc6fb2fb4dcab3798e34eb8..b588c7cb0ba065379f2cb5e8b5126c8dfcad2b53 100644
--- a/Golden_Repo/2019a/knl_overlay/l/libfabric/libfabric-1.9.0.eb
+++ b/Golden_Repo/2019a/knl_overlay/l/libfabric/libfabric-1.9.0.eb
@@ -8,7 +8,7 @@ description = """libfabric"""
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = ['https://github.com/ofiwg/libfabric/releases/download/v%(version)s/']
sources = [SOURCELOWER_TAR_BZ2]
diff --git a/Golden_Repo/2019a/knl_overlay/p/psmpi-settings/psmpi-settings-5.2-default.eb b/Golden_Repo/2019a/knl_overlay/p/psmpi-settings/psmpi-settings-5.2-default.eb
index dc2ecb9f221f344cc2a31be841cb100ed601c045..86ac40e0653f898a4f04e7af2a84955573fda238 100644
--- a/Golden_Repo/2019a/knl_overlay/p/psmpi-settings/psmpi-settings-5.2-default.eb
+++ b/Golden_Repo/2019a/knl_overlay/p/psmpi-settings/psmpi-settings-5.2-default.eb
@@ -9,7 +9,7 @@ description = """This is a module to load the default ParaStationMPI configurati
site_contacts = 'd.alvarez@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = []
diff --git a/Golden_Repo/2019a/knl_overlay/p/psmpi-settings/psmpi-settings-5.2-mt-default.eb b/Golden_Repo/2019a/knl_overlay/p/psmpi-settings/psmpi-settings-5.2-mt-default.eb
index da0250abcd007bd5c06157ba24a24e5f861b867f..16eb0a7d0d6144dbe375e901d922448a34eb005b 100644
--- a/Golden_Repo/2019a/knl_overlay/p/psmpi-settings/psmpi-settings-5.2-mt-default.eb
+++ b/Golden_Repo/2019a/knl_overlay/p/psmpi-settings/psmpi-settings-5.2-mt-default.eb
@@ -9,7 +9,7 @@ description = """This is a module to load the default ParaStationMPI configurati
site_contacts = 'd.alvarez@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = []
diff --git a/Golden_Repo/2019a/knl_overlay/p/psmpi-settings/psmpi-settings-5.4-default.eb b/Golden_Repo/2019a/knl_overlay/p/psmpi-settings/psmpi-settings-5.4-default.eb
index e18f4e6f00934fa34ab5de62bdf3acec256e0f0d..de8c90a4ce5a2c1f03f2e22f465b0288ec91c58b 100644
--- a/Golden_Repo/2019a/knl_overlay/p/psmpi-settings/psmpi-settings-5.4-default.eb
+++ b/Golden_Repo/2019a/knl_overlay/p/psmpi-settings/psmpi-settings-5.4-default.eb
@@ -9,7 +9,7 @@ description = """This is a module to load the default ParaStationMPI configurati
site_contacts = 'd.alvarez@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = []
diff --git a/Golden_Repo/2019a/knl_overlay/p/psmpi-settings/psmpi-settings-5.4-mt-default.eb b/Golden_Repo/2019a/knl_overlay/p/psmpi-settings/psmpi-settings-5.4-mt-default.eb
index c6c09a6c8e31c9f31a4efa74579876fbf4e5ac28..87f4cbff456857d275cb83073d1f47e61d25b960 100644
--- a/Golden_Repo/2019a/knl_overlay/p/psmpi-settings/psmpi-settings-5.4-mt-default.eb
+++ b/Golden_Repo/2019a/knl_overlay/p/psmpi-settings/psmpi-settings-5.4-mt-default.eb
@@ -9,7 +9,7 @@ description = """This is a module to load the default ParaStationMPI configurati
site_contacts = 'd.alvarez@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = []
diff --git a/Golden_Repo/2019a/l/libtool/libtool-2.4.6.eb b/Golden_Repo/2019a/l/libtool/libtool-2.4.6.eb
index be94f7ec3e503d7d545272adc8a34cb2f3fb44b1..87b5fa6d1b2041f8a3d283f0ff4cc6d58f491b2c 100644
--- a/Golden_Repo/2019a/l/libtool/libtool-2.4.6.eb
+++ b/Golden_Repo/2019a/l/libtool/libtool-2.4.6.eb
@@ -10,7 +10,7 @@ description = """GNU libtool is a generic library support script. Libtool hides
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
sources = [SOURCELOWER_TAR_GZ]
source_urls = [GNU_SOURCE]
diff --git a/Golden_Repo/2019a/m/M4/M4-1.4.18.eb b/Golden_Repo/2019a/m/M4/M4-1.4.18.eb
index 49b942a673f5296e9651fede11761425923603fb..d686b2eb04b511fde3cecd0ea74d3d3cb012f7d5 100644
--- a/Golden_Repo/2019a/m/M4/M4-1.4.18.eb
+++ b/Golden_Repo/2019a/m/M4/M4-1.4.18.eb
@@ -12,7 +12,7 @@ description = """GNU M4 is an implementation of the traditional Unix macro proce
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': ''}
+toolchain = SYSTEM
sources = [SOURCELOWER_TAR_GZ]
source_urls = [GNU_SOURCE]
diff --git a/Golden_Repo/2019a/m/MVAPICH2-settings/MVAPICH2-2.3-GDR-default.eb b/Golden_Repo/2019a/m/MVAPICH2-settings/MVAPICH2-2.3-GDR-default.eb
index 82a0207ac8606f7956c73d74b83c4c64a94a8063..99738f023157eff885683f6cf98849d443502f67 100644
--- a/Golden_Repo/2019a/m/MVAPICH2-settings/MVAPICH2-2.3-GDR-default.eb
+++ b/Golden_Repo/2019a/m/MVAPICH2-settings/MVAPICH2-2.3-GDR-default.eb
@@ -9,7 +9,7 @@ description = """This is a module to load the default MVAPICH2 GDR configuration
site_contacts = 'd.alvarez@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = []
diff --git a/Golden_Repo/2019a/n/ncurses/ncurses-6.1.eb b/Golden_Repo/2019a/n/ncurses/ncurses-6.1.eb
index 4a7e3b6bea3d34ffc62cca4bcc535b8b1c15635c..001f9ec6646bc8662f570603791b1db681d6085d 100644
--- a/Golden_Repo/2019a/n/ncurses/ncurses-6.1.eb
+++ b/Golden_Repo/2019a/n/ncurses/ncurses-6.1.eb
@@ -11,7 +11,7 @@ description = """The Ncurses (new curses) library is a free software emulation o
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
toolchainopts = {'optarch': True, 'pic': True}
source_urls = [GNU_SOURCE]
diff --git a/Golden_Repo/2019a/n/numactl/numactl-2.0.12.eb b/Golden_Repo/2019a/n/numactl/numactl-2.0.12.eb
index 5e3a8bbc1a57d957d7bd44fea42a0fa7ab16e848..ba968214d0a6ab0272953121e41b88777ed1faff 100644
--- a/Golden_Repo/2019a/n/numactl/numactl-2.0.12.eb
+++ b/Golden_Repo/2019a/n/numactl/numactl-2.0.12.eb
@@ -11,7 +11,7 @@ description = """The numactl program allows you to run your application program
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': ''}
+toolchain = SYSTEM
source_urls = ['https://github.com/numactl/numactl/archive/']
sources = ['v%(version)s.tar.gz']
diff --git a/Golden_Repo/2019a/n/nvidia/nvidia-418.40.04.eb b/Golden_Repo/2019a/n/nvidia/nvidia-418.40.04.eb
index 0ff26a19de31ecc056b999aeab67256d085d6d7c..5c70c75ac5131ff048425373a34bef73eb06cdb4 100644
--- a/Golden_Repo/2019a/n/nvidia/nvidia-418.40.04.eb
+++ b/Golden_Repo/2019a/n/nvidia/nvidia-418.40.04.eb
@@ -6,7 +6,7 @@ description = """This is a set of libraries normally installed by the NVIDIA dri
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = [
'http://us.download.nvidia.com/tesla/%(version)s/',
diff --git a/Golden_Repo/2019a/n/nvidia/nvidia-418.87.00.eb b/Golden_Repo/2019a/n/nvidia/nvidia-418.87.00.eb
index cea2ddb57e06c134ad265cd1c60d59215d356353..e65755758b83850cb075077913a143e8f1fd943c 100644
--- a/Golden_Repo/2019a/n/nvidia/nvidia-418.87.00.eb
+++ b/Golden_Repo/2019a/n/nvidia/nvidia-418.87.00.eb
@@ -6,7 +6,7 @@ description = """This is a set of libraries normally installed by the NVIDIA dri
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = [
'http://us.download.nvidia.com/tesla/%(version)s/',
diff --git a/Golden_Repo/2019a/n/nvidia/nvidia-driver.eb b/Golden_Repo/2019a/n/nvidia/nvidia-driver.eb
index 113c5fda8adcbeaad86329b6417fbc5e6099fac7..a864b200450c641a7c76b71df0f683387f6c4aa1 100644
--- a/Golden_Repo/2019a/n/nvidia/nvidia-driver.eb
+++ b/Golden_Repo/2019a/n/nvidia/nvidia-driver.eb
@@ -7,7 +7,7 @@ description = """This is a set of libraries normally installed by the NVIDIA dri
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = [
'http://us.download.nvidia.com/tesla/%s/' % realversion,
diff --git a/Golden_Repo/2019a/p/PGI/PGI-19.10-GCC-8.3.0.eb b/Golden_Repo/2019a/p/PGI/PGI-19.10-GCC-8.3.0.eb
index dbda3e86ddd302a6665f425aaec9c6886b1e8bb0..23ac1fd2f75d3bf8450608a7fb4c58b4675f5003 100644
--- a/Golden_Repo/2019a/p/PGI/PGI-19.10-GCC-8.3.0.eb
+++ b/Golden_Repo/2019a/p/PGI/PGI-19.10-GCC-8.3.0.eb
@@ -9,7 +9,7 @@ description = """C, C++ and Fortran compilers from The Portland Group - PGI"""
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': ''}
+toolchain = SYSTEM
sources = ['pgilinux-20%(version_major)s-%(version_major)s%(version_minor)s-x86-64.tar.gz']
diff --git a/Golden_Repo/2019a/p/PGI/PGI-19.3-GCC-8.3.0.eb b/Golden_Repo/2019a/p/PGI/PGI-19.3-GCC-8.3.0.eb
index 35c30c895b21be83157dff004366c1fa84c77839..ff09299ae2c41636c964c5edc7339ce57e850b4d 100644
--- a/Golden_Repo/2019a/p/PGI/PGI-19.3-GCC-8.3.0.eb
+++ b/Golden_Repo/2019a/p/PGI/PGI-19.3-GCC-8.3.0.eb
@@ -9,7 +9,7 @@ description = """C, C++ and Fortran compilers from The Portland Group - PGI"""
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': ''}
+toolchain = SYSTEM
sources = ['pgilinux-20%(version_major)s-%(version_major)s%(version_minor)s-x86-64.tar.gz']
diff --git a/Golden_Repo/2019a/p/Panoply/Panoply-4.10.5.eb b/Golden_Repo/2019a/p/Panoply/Panoply-4.10.5.eb
index b926102b2b59f80b54eec6e87575a9fddaf05a60..df3831c928e4d0a616291d101b5d59e7bdb5c27a 100644
--- a/Golden_Repo/2019a/p/Panoply/Panoply-4.10.5.eb
+++ b/Golden_Repo/2019a/p/Panoply/Panoply-4.10.5.eb
@@ -8,7 +8,7 @@ description = "Panoply plots geo-referenced and other arrays from netCDF, HDF, G
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': ''}
+toolchain = SYSTEM
sources = ['%(name)sJ-%(version)s.tgz']
source_urls = ['https://www.giss.nasa.gov/tools/panoply/download/']
diff --git a/Golden_Repo/2019a/p/pandoc/pandoc-2.7.2.eb b/Golden_Repo/2019a/p/pandoc/pandoc-2.7.2.eb
index 23110295bde41cd0bb6d98f5396a0bc043c3b423..465675d0a6db4af2e3aabf7b9f6ebb3ba308585d 100644
--- a/Golden_Repo/2019a/p/pandoc/pandoc-2.7.2.eb
+++ b/Golden_Repo/2019a/p/pandoc/pandoc-2.7.2.eb
@@ -13,7 +13,7 @@ description = "If you need to convert files from one markup format into another,
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': ''}
+toolchain = SYSTEM
source_urls = ['https://github.com/jgm/pandoc/releases/download/%(version)s/']
sources = ['%(name)s-%(version)s-linux.tar.gz']
diff --git a/Golden_Repo/2019a/p/pkg-config/pkg-config-0.29.2.eb b/Golden_Repo/2019a/p/pkg-config/pkg-config-0.29.2.eb
index 05a3fed5190a435fe25c87ae0788972ccd666bd0..3594e4a89bc9ea50894898c2c047de88b9ba31b9 100644
--- a/Golden_Repo/2019a/p/pkg-config/pkg-config-0.29.2.eb
+++ b/Golden_Repo/2019a/p/pkg-config/pkg-config-0.29.2.eb
@@ -12,7 +12,7 @@ description = """pkg-config is a helper tool used when compiling applications an
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
sources = [SOURCELOWER_TAR_GZ]
source_urls = ['http://pkgconfig.freedesktop.org/releases/']
diff --git a/Golden_Repo/2019a/p/pmvapich2c/pmvapich2c-2019a-GDR.eb b/Golden_Repo/2019a/p/pmvapich2c/pmvapich2c-2019a-GDR.eb
index 15e7813856060128a5cad58ed46b2fe1d4f1d832..3745cbf471cc18bb6b1d3cae02a35eeb36642a1c 100644
--- a/Golden_Repo/2019a/p/pmvapich2c/pmvapich2c-2019a-GDR.eb
+++ b/Golden_Repo/2019a/p/pmvapich2c/pmvapich2c-2019a-GDR.eb
@@ -9,7 +9,7 @@ description = """PGI based compiler toolchain, including CUDA and MVAPICH2 for C
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
compname = 'PGI'
compver = '19.3'
diff --git a/Golden_Repo/2019a/p/pmvmklc/pmvmklc-2019a-GDR.eb b/Golden_Repo/2019a/p/pmvmklc/pmvmklc-2019a-GDR.eb
index 6e20fe4ee5d1279d3d98c79c54ec028719dc9728..5aa78f78479bf535a7ef5443553b9bdb54c6d538 100644
--- a/Golden_Repo/2019a/p/pmvmklc/pmvmklc-2019a-GDR.eb
+++ b/Golden_Repo/2019a/p/pmvmklc/pmvmklc-2019a-GDR.eb
@@ -10,7 +10,7 @@ description = """ PGI based compiler toolchain,
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
comp_name = 'PGI'
comp_version = '19.3-GCC-8.3.0'
diff --git a/Golden_Repo/2019a/p/popt/popt-1.16.eb b/Golden_Repo/2019a/p/popt/popt-1.16.eb
index 764e664482600457216c911728985e3252e53b58..26a3e9f43bd3181850ecc73712a76d18e55cd9a1 100644
--- a/Golden_Repo/2019a/p/popt/popt-1.16.eb
+++ b/Golden_Repo/2019a/p/popt/popt-1.16.eb
@@ -9,7 +9,7 @@ description = """Popt is a C library for parsing command line parameters.
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'version': '', 'name': 'dummy'}
+toolchain = SYSTEM
sources = [SOURCE_TAR_GZ]
source_urls = ['http://rpm5.org/files/%(name)s/']
diff --git a/Golden_Repo/2019a/p/pscom/pscom-5.2-default.eb b/Golden_Repo/2019a/p/pscom/pscom-5.2-default.eb
index fa0628d3d20e80b9688f37bddef42918e131d20a..a47f7984426e2a6e9a422ede3b06848b0ad927b0 100644
--- a/Golden_Repo/2019a/p/pscom/pscom-5.2-default.eb
+++ b/Golden_Repo/2019a/p/pscom/pscom-5.2-default.eb
@@ -11,7 +11,7 @@ communication layer (MPI) and a sophisticated management layer.
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': ''}
+toolchain = SYSTEM
sources = ['%%(name)s-%s.tar.gz' % realversion]
diff --git a/Golden_Repo/2019a/p/pscom/pscom-5.2.9-1-patched.eb b/Golden_Repo/2019a/p/pscom/pscom-5.2.9-1-patched.eb
index 91f2956ef8b344f16575adf8548af2d187d5cb10..8d3dabf90fa5309ca8e0a74f058042f98e746622 100644
--- a/Golden_Repo/2019a/p/pscom/pscom-5.2.9-1-patched.eb
+++ b/Golden_Repo/2019a/p/pscom/pscom-5.2.9-1-patched.eb
@@ -11,7 +11,7 @@ communication layer (MPI) and a sophisticated management layer.
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': ''}
+toolchain = SYSTEM
sources = ['%s.zip' % version]
source_urls = ['https://github.com/ParaStation/%(name)s/archive/']
diff --git a/Golden_Repo/2019a/p/pscom/pscom-5.3.0-1_115_g12720ef_gateway.eb b/Golden_Repo/2019a/p/pscom/pscom-5.3.0-1_115_g12720ef_gateway.eb
index 5bfe8409b6861f9d7bb13a40895696d3a5daecb2..d5485f3d42b707781f057ca696c4ddade90afc34 100644
--- a/Golden_Repo/2019a/p/pscom/pscom-5.3.0-1_115_g12720ef_gateway.eb
+++ b/Golden_Repo/2019a/p/pscom/pscom-5.3.0-1_115_g12720ef_gateway.eb
@@ -12,7 +12,7 @@ communication layer (MPI) and a sophisticated management layer.
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': ''}
+toolchain = SYSTEM
sources = ['%%(name)s-%s.tar.gz' % realversion]
diff --git a/Golden_Repo/2019a/p/pscom/pscom-Default.eb b/Golden_Repo/2019a/p/pscom/pscom-Default.eb
index 2c6aed577e1a0a68e59c0867d59c7527f15986bb..ecbb9d0f63a7b1f96ef6ca3d5905b6eb90d0e4fa 100644
--- a/Golden_Repo/2019a/p/pscom/pscom-Default.eb
+++ b/Golden_Repo/2019a/p/pscom/pscom-Default.eb
@@ -11,7 +11,7 @@ communication layer (MPI) and a sophisticated management layer.
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': ''}
+toolchain = SYSTEM
sources = ['%%(name)s-%s.tar.gz' % realversion]
diff --git a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-UCX-RC.eb b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-UCX-RC.eb
index 8eff75b00b5d01396a17e899b6042eba9b369737..eaee7633ec13c868c25e11389a1ef41a8b9443cc 100644
--- a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-UCX-RC.eb
+++ b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-UCX-RC.eb
@@ -9,7 +9,7 @@ description = """This is a module to load the ParaStationMPI settings to be used
site_contacts = 'd.alvarez@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = []
diff --git a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-UCX-UD.eb b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-UCX-UD.eb
index 2681244b0b16e50af5cd5e85ed342a1354185f0e..02c7f883936947fc6d1d2ad0c163c1571b7048b5 100644
--- a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-UCX-UD.eb
+++ b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-UCX-UD.eb
@@ -9,7 +9,7 @@ description = """This is a module to load the ParaStationMPI settings to be used
site_contacts = 'd.alvarez@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = []
diff --git a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-default.eb b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-default.eb
index 34e850105601774b462fbc984a1cc9ccb729f221..8edf2fa2b7310d7e8f64ddafa23515bf80e059ea 100644
--- a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-default.eb
+++ b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-default.eb
@@ -9,7 +9,7 @@ description = """This is a module to load the default ParaStationMPI configurati
site_contacts = 'd.alvarez@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = []
diff --git a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-large-job-hybrid.eb b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-large-job-hybrid.eb
index b8470f8f1867aa3f773594ca391f05c138f802b4..6f5cac9b5f07e3b2cf62c208ad0ad761ba7a5842 100644
--- a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-large-job-hybrid.eb
+++ b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-large-job-hybrid.eb
@@ -9,7 +9,7 @@ description = """This is a module to load the ParaStationMPI settings to be used
site_contacts = 'd.alvarez@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = []
diff --git a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-large-job-mpi.eb b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-large-job-mpi.eb
index a9a03ace9e845637db6582a8a004004cad941f1c..e38a63fd0080ce3d7f06c87665e8e9e0e2166bdf 100644
--- a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-large-job-mpi.eb
+++ b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-large-job-mpi.eb
@@ -9,7 +9,7 @@ description = """This is a module to load the ParaStationMPI settings to be used
site_contacts = 'd.alvarez@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = []
diff --git a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-mt-UCX-RC.eb b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-mt-UCX-RC.eb
index a5ef4cee9dce152b0f972fb2e6713b8f97c78139..caa43e6f6b196adcf0597de3c15a6a015ad79b47 100644
--- a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-mt-UCX-RC.eb
+++ b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-mt-UCX-RC.eb
@@ -9,7 +9,7 @@ description = """This is a module to load the ParaStationMPI settings to be used
site_contacts = 'd.alvarez@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = []
diff --git a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-mt-UCX-UD.eb b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-mt-UCX-UD.eb
index 6831ae9ba19b8acdcc818a6698c09319fdbfeede..41776450565931ff327ed68f56ca4ca9b207231e 100644
--- a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-mt-UCX-UD.eb
+++ b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-mt-UCX-UD.eb
@@ -9,7 +9,7 @@ description = """This is a module to load the ParaStationMPI settings to be used
site_contacts = 'd.alvarez@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = []
diff --git a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-mt-default.eb b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-mt-default.eb
index 252f93b24b5b9da46ec9845a59785df23efa8ff2..69ef05e21334fbea9aca76732006d498d5900734 100644
--- a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-mt-default.eb
+++ b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-mt-default.eb
@@ -9,7 +9,7 @@ description = """This is a module to load the default ParaStationMPI configurati
site_contacts = 'd.alvarez@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = []
diff --git a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-mt-large-job-hybrid.eb b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-mt-large-job-hybrid.eb
index 4679b0af1d258e5522ecd82ded72a8b543ea9b74..005d1bf8f9d214011ecf12f03cbbe00829edd3ea 100644
--- a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-mt-large-job-hybrid.eb
+++ b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-mt-large-job-hybrid.eb
@@ -9,7 +9,7 @@ description = """This is a module to load the ParaStationMPI settings to be used
site_contacts = 'd.alvarez@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = []
diff --git a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-mt-large-job-mpi.eb b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-mt-large-job-mpi.eb
index 0be2e542202f5e3259bea944132abe558771aa0d..1ca83efd5ed4659ecc8247c7406272cfd0ef463a 100644
--- a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-mt-large-job-mpi.eb
+++ b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.2-mt-large-job-mpi.eb
@@ -9,7 +9,7 @@ description = """This is a module to load the ParaStationMPI settings to be used
site_contacts = 'd.alvarez@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = []
diff --git a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-UCX-RC.eb b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-UCX-RC.eb
index ffef7a2ddfa173c408661fc1a0f63f794479aac2..7b3ebd0a9233554b1e4865a7ca2c9fa4450bd108 100644
--- a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-UCX-RC.eb
+++ b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-UCX-RC.eb
@@ -9,7 +9,7 @@ description = """This is a module to load the ParaStationMPI settings to be used
site_contacts = 'd.alvarez@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = []
diff --git a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-UCX-UD.eb b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-UCX-UD.eb
index 960d1f272cccdfa0a42b6f0fa4717246140c2fff..cabeaa0e76cbfce5020c9e899e1588bed5237434 100644
--- a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-UCX-UD.eb
+++ b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-UCX-UD.eb
@@ -9,7 +9,7 @@ description = """This is a module to load the ParaStationMPI settings to be used
site_contacts = 'd.alvarez@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = []
diff --git a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-default.eb b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-default.eb
index e18f4e6f00934fa34ab5de62bdf3acec256e0f0d..de8c90a4ce5a2c1f03f2e22f465b0288ec91c58b 100644
--- a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-default.eb
+++ b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-default.eb
@@ -9,7 +9,7 @@ description = """This is a module to load the default ParaStationMPI configurati
site_contacts = 'd.alvarez@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = []
diff --git a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-large-job-hybrid.eb b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-large-job-hybrid.eb
index 03e059f6bdca99a8944e399d512547ca346f074f..8e281e39b7e05763081be42d69a6619248d30e09 100644
--- a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-large-job-hybrid.eb
+++ b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-large-job-hybrid.eb
@@ -9,7 +9,7 @@ description = """This is a module to load the ParaStationMPI settings to be used
site_contacts = 'd.alvarez@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = []
diff --git a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-large-job-mpi.eb b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-large-job-mpi.eb
index 6964ab35b1dd147ab7a533da1846a5727af213f7..dd35bcacd9228b55e37bc048dce54df946aa2429 100644
--- a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-large-job-mpi.eb
+++ b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-large-job-mpi.eb
@@ -9,7 +9,7 @@ description = """This is a module to load the ParaStationMPI settings to be used
site_contacts = 'd.alvarez@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = []
diff --git a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-mt-UCX-RC.eb b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-mt-UCX-RC.eb
index 6c4cf7d55225bbed6dcafc6fbe5c3136262a064f..936c58df3271175ea8873ac48b50ef2a04350d9d 100644
--- a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-mt-UCX-RC.eb
+++ b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-mt-UCX-RC.eb
@@ -9,7 +9,7 @@ description = """This is a module to load the ParaStationMPI settings to be used
site_contacts = 'd.alvarez@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = []
diff --git a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-mt-UCX-UD.eb b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-mt-UCX-UD.eb
index fa2a4c36825bcfdaee27910e182fd945283dcc5a..2a51d538a5a72234e1d227cb0e2a32555de8cbcb 100644
--- a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-mt-UCX-UD.eb
+++ b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-mt-UCX-UD.eb
@@ -9,7 +9,7 @@ description = """This is a module to load the ParaStationMPI settings to be used
site_contacts = 'd.alvarez@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = []
diff --git a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-mt-default.eb b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-mt-default.eb
index c6c09a6c8e31c9f31a4efa74579876fbf4e5ac28..87f4cbff456857d275cb83073d1f47e61d25b960 100644
--- a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-mt-default.eb
+++ b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-mt-default.eb
@@ -9,7 +9,7 @@ description = """This is a module to load the default ParaStationMPI configurati
site_contacts = 'd.alvarez@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = []
diff --git a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-mt-large-job-hybrid.eb b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-mt-large-job-hybrid.eb
index 019906632cf93ded81d40bf1360f3007f2bd3caa..768dbf340d4db7e57ba1b2296d578a21b2d51858 100644
--- a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-mt-large-job-hybrid.eb
+++ b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-mt-large-job-hybrid.eb
@@ -9,7 +9,7 @@ description = """This is a module to load the ParaStationMPI settings to be used
site_contacts = 'd.alvarez@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = []
diff --git a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-mt-large-job-mpi.eb b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-mt-large-job-mpi.eb
index e7f46f3fe6ec6d9b8a049713c698b73d87211687..1900912490583153df21828f8da46a1725d85e18 100644
--- a/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-mt-large-job-mpi.eb
+++ b/Golden_Repo/2019a/p/psmpi-settings/psmpi-settings-5.4-mt-large-job-mpi.eb
@@ -9,7 +9,7 @@ description = """This is a module to load the ParaStationMPI settings to be used
site_contacts = 'd.alvarez@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
source_urls = []
diff --git a/Golden_Repo/2019a/r/rpmrebuild/rpmrebuild-2.14.eb b/Golden_Repo/2019a/r/rpmrebuild/rpmrebuild-2.14.eb
index 4ac5adf86d86d10ea7fffeda94797b6aa3269e81..f2c01e98fb72cc697f2c8ebd139d8134bbb898c1 100644
--- a/Golden_Repo/2019a/r/rpmrebuild/rpmrebuild-2.14.eb
+++ b/Golden_Repo/2019a/r/rpmrebuild/rpmrebuild-2.14.eb
@@ -17,7 +17,7 @@ description = """rpmrebuild is a tool to build an RPM file from a package that h
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'version': 'dummy', 'name': 'dummy'}
+toolchain = SYSTEM
source_urls = [SOURCEFORGE_SOURCE]
sources = [SOURCELOWER_TAR_GZ]
diff --git a/Golden_Repo/2019a/t/TotalView/TotalView-2019.0.4.eb b/Golden_Repo/2019a/t/TotalView/TotalView-2019.0.4.eb
index e24e9f892409741aa204cb5992d39717e8a1d0f3..5f32536e47f4230e4644cf0490a53765afadf376 100644
--- a/Golden_Repo/2019a/t/TotalView/TotalView-2019.0.4.eb
+++ b/Golden_Repo/2019a/t/TotalView/TotalView-2019.0.4.eb
@@ -37,7 +37,7 @@ description = """TotalView breaks down barriers to understanding what's going on
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
sources = [
'%(namelower)s_%(version)s_linux_x86-64.tar',
diff --git a/Golden_Repo/2019a/t/tbb/tbb-2019.4.199.eb b/Golden_Repo/2019a/t/tbb/tbb-2019.4.199.eb
index 3e101f1d64df7582976f9180d040ec3033ab2561..0125e051400c834679f8db428a5bb92f6e2a0fe5 100644
--- a/Golden_Repo/2019a/t/tbb/tbb-2019.4.199.eb
+++ b/Golden_Repo/2019a/t/tbb/tbb-2019.4.199.eb
@@ -11,7 +11,7 @@ applications that tap into the power and performance of multicore and manycore h
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
year = version.split('.')[0]
update = version.split('.')[1]
diff --git a/Golden_Repo/2019a/t/tbb/tbb-2019.8.281.eb b/Golden_Repo/2019a/t/tbb/tbb-2019.8.281.eb
index 7f6c0b8fabd827d86d07f223519f5efd0616102e..555ee82380dc9c1533ebb0e12964f699d8840b64 100644
--- a/Golden_Repo/2019a/t/tbb/tbb-2019.8.281.eb
+++ b/Golden_Repo/2019a/t/tbb/tbb-2019.8.281.eb
@@ -11,7 +11,7 @@ applications that tap into the power and performance of multicore and manycore h
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
year = version.split('.')[0]
update = version.split('.')[1]
diff --git a/Golden_Repo/2019a/u/UCX/UCX-1.6.1.eb b/Golden_Repo/2019a/u/UCX/UCX-1.6.1.eb
index 122be892f41579225ef0c588cf70d209609f0377..e4cad76b05e724c103e50d044cdc4658227af05d 100644
--- a/Golden_Repo/2019a/u/UCX/UCX-1.6.1.eb
+++ b/Golden_Repo/2019a/u/UCX/UCX-1.6.1.eb
@@ -13,7 +13,7 @@ and high-performance applications
site_contacts = 'd.alvarez@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': ''}
+toolchain = SYSTEM
toolchainopts = {'pic': True}
source_urls = ['https://github.com/openucx/ucx/releases/download/v%(version)s%(versionsuffix)s']
diff --git a/Golden_Repo/2019a/u/UCX/UCX-1.7.0.eb b/Golden_Repo/2019a/u/UCX/UCX-1.7.0.eb
index 2a7f38b057f96addebeb510af306e3ec4b8bb1b5..0d573ab28bd3db31ed9d9b2c3ac9b0555f473ca5 100644
--- a/Golden_Repo/2019a/u/UCX/UCX-1.7.0.eb
+++ b/Golden_Repo/2019a/u/UCX/UCX-1.7.0.eb
@@ -13,7 +13,7 @@ and high-performance applications
site_contacts = 'd.alvarez@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': ''}
+toolchain = SYSTEM
toolchainopts = {'pic': True}
source_urls = ['https://github.com/openucx/ucx/releases/download/v%(version)s%(versionsuffix)s']
diff --git a/Golden_Repo/2019a/v/VTune/VTune-2019_update3.eb b/Golden_Repo/2019a/v/VTune/VTune-2019_update3.eb
index da4f2ca7c5eafe3425df9efd29683755a76d0ce6..d1faf126f6ef5f0d6076071b7df9e64a70755bfe 100644
--- a/Golden_Repo/2019a/v/VTune/VTune-2019_update3.eb
+++ b/Golden_Repo/2019a/v/VTune/VTune-2019_update3.eb
@@ -6,7 +6,7 @@ description = 'Intel VTune Amplifier is the premier performance profiler for C,
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
sources = ['vtune_amplifier_%(version)s.tar.gz']
diff --git a/Golden_Repo/2019a/v/VTune/VTune-2019_update6.eb b/Golden_Repo/2019a/v/VTune/VTune-2019_update6.eb
index 38851311efa705e4e04f00711cd9a66e4f626bed..b1bfbd66a8816d45f95bbbc778f95b93d2ec5318 100644
--- a/Golden_Repo/2019a/v/VTune/VTune-2019_update6.eb
+++ b/Golden_Repo/2019a/v/VTune/VTune-2019_update6.eb
@@ -6,7 +6,7 @@ description = 'Intel VTune Amplifier is the premier performance profiler for C,
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
sources = ['vtune_amplifier_%(version)s.tar.gz']
diff --git a/Golden_Repo/2019a/v/Vampir/Vampir-9.6.1.eb b/Golden_Repo/2019a/v/Vampir/Vampir-9.6.1.eb
index 4198e6205633d6c16d2660038eb3566cd5aebd61..ff39cc978283d652a0a96ea5f4e4218d3aa6b87c 100644
--- a/Golden_Repo/2019a/v/Vampir/Vampir-9.6.1.eb
+++ b/Golden_Repo/2019a/v/Vampir/Vampir-9.6.1.eb
@@ -21,7 +21,7 @@ description = """The VAMPIR software tool provides an easy-to-use framework that
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': 'dummy'}
+toolchain = SYSTEM
sources = ['vampir-%s%s-setup.bin' % (version, archsuffix)]
diff --git a/Golden_Repo/2019a/z/zlib/zlib-1.2.11.eb b/Golden_Repo/2019a/z/zlib/zlib-1.2.11.eb
index 4258d4c24532fb0a36a57d8600bff903cdc92c5d..ae1f3363a794a9901cb8db80128dc94928b85153 100644
--- a/Golden_Repo/2019a/z/zlib/zlib-1.2.11.eb
+++ b/Golden_Repo/2019a/z/zlib/zlib-1.2.11.eb
@@ -11,12 +11,12 @@ description = """zlib is designed to be a free, general-purpose, legally unencum
site_contacts = 'sc@fz-juelich.de'
-toolchain = {'name': 'dummy', 'version': ''}
+toolchain = SYSTEM
sources = [SOURCELOWER_TAR_GZ]
source_urls = [('http://sourceforge.net/projects/libpng/files/zlib/%(version)s', 'download')]
-# need to take care of $CFLAGS ourselves with dummy toolchain
+# need to take care of $CFLAGS ourselves with system toolchain
# we need to add -fPIC, but should also include -O* option to avoid compiling with -O0 (default for GCC)
buildopts = 'CFLAGS="-O2 -fPIC"'